Skip to content

MLE-27883 adapt cts.param in the Optic API for MLS 12.1 #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RitaChen609 merged 3 commits into from
May 13, 2026
Merged

MLE-27883 adapt cts.param in the Optic API for MLS 12.1 #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7500ee6
MLE-27883 adapt cts.param in the Optic API for MLS 12.1
RitaChen609 May 7, 2026
5cc0e0d
MLE-27883 update Copyright
RitaChen609 May 7, 2026
4a82652
MLE-27883 fix to traverse the exported plan to verify the cts namespace
RitaChen609 May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions lib/plan-builder-generated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ circleRadius(...args) {
* @returns { CtsQuery }
*/
collectionQuery(...args) {
const paramdef = ['uris', [types.XsString], false, true];
const paramdef = ['uris', [types.XsString, types.CtsParam], false, true];
const checkedArgs = bldrbase.makeSingleArgs('cts.collectionQuery', 1, paramdef, args);
return new types.CtsQuery('cts', 'collection-query', checkedArgs);
}
Expand Down Expand Up @@ -241,7 +241,7 @@ collectionReference(...args) {
*/
columnRangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'schema');
const paramdefs = [['schema', [types.XsString], true, false], ['view', [types.XsString], true, false], ['column', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['operator', [types.XsString], false, false], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['schema', [types.XsString], true, false], ['view', [types.XsString], true, false], ['column', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['operator', [types.XsString], false, false], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.columnRangeQuery', 4, new Set(['schema', 'view', 'column', 'value', 'operator', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.columnRangeQuery', 4, false, paramdefs, args);
Expand Down Expand Up @@ -275,7 +275,7 @@ complexPolygon(...args) {
*/
directoryQuery(...args) {
const namer = bldrbase.getNamer(args, 'uris');
const paramdefs = [['uris', [types.XsString], false, true], ['depth', [types.XsString], false, false]];
const paramdefs = [['uris', [types.XsString, types.CtsParam], false, true], ['depth', [types.XsString], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.directoryQuery', 1, new Set(['uris', 'depth']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.directoryQuery', 1, false, paramdefs, args);
Expand Down Expand Up @@ -331,7 +331,7 @@ documentPermissionQuery(...args) {
* @returns { CtsQuery }
*/
documentQuery(...args) {
const paramdef = ['uris', [types.XsString], false, true];
const paramdef = ['uris', [types.XsString, types.CtsParam], false, true];
const checkedArgs = bldrbase.makeSingleArgs('cts.documentQuery', 1, paramdef, args);
return new types.CtsQuery('cts', 'document-query', checkedArgs);
}
Expand Down Expand Up @@ -382,7 +382,7 @@ elementAttributePairGeospatialQuery(...args) {
*/
elementAttributeRangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'element-name');
const paramdefs = [['element-name', [types.XsQName], false, true], ['attribute-name', [types.XsQName], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['element-name', [types.XsQName], false, true], ['attribute-name', [types.XsQName], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.elementAttributeRangeQuery', 4, new Set(['element-name', 'attribute-name', 'operator', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.elementAttributeRangeQuery', 4, false, paramdefs, args);
Expand Down Expand Up @@ -420,7 +420,7 @@ elementAttributeReference(...args) {
*/
elementAttributeValueQuery(...args) {
const namer = bldrbase.getNamer(args, 'element-name');
const paramdefs = [['element-name', [types.XsQName], false, true], ['attribute-name', [types.XsQName], false, true], ['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['element-name', [types.XsQName], false, true], ['attribute-name', [types.XsQName], false, true], ['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.elementAttributeValueQuery', 3, new Set(['element-name', 'attribute-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.elementAttributeValueQuery', 3, false, paramdefs, args);
Expand All @@ -440,7 +440,7 @@ elementAttributeValueQuery(...args) {
*/
elementAttributeWordQuery(...args) {
const namer = bldrbase.getNamer(args, 'element-name');
const paramdefs = [['element-name', [types.XsQName], false, true], ['attribute-name', [types.XsQName], false, true], ['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['element-name', [types.XsQName], false, true], ['attribute-name', [types.XsQName], false, true], ['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.elementAttributeWordQuery', 3, new Set(['element-name', 'attribute-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.elementAttributeWordQuery', 3, false, paramdefs, args);
Expand Down Expand Up @@ -537,7 +537,7 @@ elementQuery(...args) {
*/
elementRangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'element-name');
const paramdefs = [['element-name', [types.XsQName], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['element-name', [types.XsQName], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.elementRangeQuery', 3, new Set(['element-name', 'operator', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.elementRangeQuery', 3, false, paramdefs, args);
Expand Down Expand Up @@ -573,7 +573,7 @@ elementReference(...args) {
*/
elementValueQuery(...args) {
const namer = bldrbase.getNamer(args, 'element-name');
const paramdefs = [['element-name', [types.XsQName], false, true], ['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['element-name', [types.XsQName], false, true], ['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.elementValueQuery', 1, new Set(['element-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.elementValueQuery', 1, false, paramdefs, args);
Expand All @@ -592,7 +592,7 @@ elementValueQuery(...args) {
*/
elementWordQuery(...args) {
const namer = bldrbase.getNamer(args, 'element-name');
const paramdefs = [['element-name', [types.XsQName], false, true], ['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['element-name', [types.XsQName], false, true], ['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.elementWordQuery', 2, new Set(['element-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.elementWordQuery', 2, false, paramdefs, args);
Expand Down Expand Up @@ -623,7 +623,7 @@ falseQuery(...args) {
*/
fieldRangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'field-name');
const paramdefs = [['field-name', [types.XsString], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['field-name', [types.XsString, types.CtsParam], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.fieldRangeQuery', 3, new Set(['field-name', 'operator', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.fieldRangeQuery', 3, false, paramdefs, args);
Expand Down Expand Up @@ -659,7 +659,7 @@ fieldReference(...args) {
*/
fieldValueQuery(...args) {
const namer = bldrbase.getNamer(args, 'field-name');
const paramdefs = [['field-name', [types.XsString], false, true], ['text', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['field-name', [types.XsString, types.CtsParam], false, true], ['text', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.fieldValueQuery', 2, new Set(['field-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.fieldValueQuery', 2, false, paramdefs, args);
Expand All @@ -678,7 +678,7 @@ fieldValueQuery(...args) {
*/
fieldWordQuery(...args) {
const namer = bldrbase.getNamer(args, 'field-name');
const paramdefs = [['field-name', [types.XsString], false, true], ['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['field-name', [types.XsString, types.CtsParam], false, true], ['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.fieldWordQuery', 2, new Set(['field-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.fieldWordQuery', 2, false, paramdefs, args);
Expand Down Expand Up @@ -828,7 +828,7 @@ jsonPropertyPairGeospatialQuery(...args) {
*/
jsonPropertyRangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'property-name');
const paramdefs = [['property-name', [types.XsString], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['property-name', [types.XsString, types.CtsParam], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.jsonPropertyRangeQuery', 3, new Set(['property-name', 'operator', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.jsonPropertyRangeQuery', 3, false, paramdefs, args);
Expand Down Expand Up @@ -881,7 +881,7 @@ jsonPropertyScopeQuery(...args) {
*/
jsonPropertyValueQuery(...args) {
const namer = bldrbase.getNamer(args, 'property-name');
const paramdefs = [['property-name', [types.XsString], false, true], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['property-name', [types.XsString, types.CtsParam], false, true], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.jsonPropertyValueQuery', 2, new Set(['property-name', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.jsonPropertyValueQuery', 2, false, paramdefs, args);
Expand All @@ -900,7 +900,7 @@ jsonPropertyValueQuery(...args) {
*/
jsonPropertyWordQuery(...args) {
const namer = bldrbase.getNamer(args, 'property-name');
const paramdefs = [['property-name', [types.XsString], false, true], ['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['property-name', [types.XsString, types.CtsParam], false, true], ['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.jsonPropertyWordQuery', 2, new Set(['property-name', 'text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.jsonPropertyWordQuery', 2, false, paramdefs, args);
Expand Down Expand Up @@ -1059,7 +1059,7 @@ pathGeospatialQuery(...args) {
*/
pathRangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'path-name');
const paramdefs = [['path-name', [types.XsString], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['path-name', [types.XsString, types.CtsParam], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.pathRangeQuery', 3, new Set(['path-name', 'operator', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.pathRangeQuery', 3, false, paramdefs, args);
Expand Down Expand Up @@ -1219,7 +1219,7 @@ propertiesFragmentQuery(...args) {
*/
rangeQuery(...args) {
const namer = bldrbase.getNamer(args, 'index');
const paramdefs = [['index', [types.CtsReference], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['index', [types.CtsReference], false, true], ['operator', [types.XsString], true, false], ['value', [types.XsAnyAtomicType, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.rangeQuery', 3, new Set(['index', 'operator', 'value', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.rangeQuery', 3, false, paramdefs, args);
Expand Down Expand Up @@ -1316,7 +1316,7 @@ uriReference(...args) {
*/
wordQuery(...args) {
const namer = bldrbase.getNamer(args, 'text');
const paramdefs = [['text', [types.XsString], false, true], ['options', [types.XsString], false, true], ['weight', [types.XsDouble], false, false]];
const paramdefs = [['text', [types.XsString, types.CtsParam], false, true], ['options', [types.XsString, types.CtsParam], false, true], ['weight', [types.XsDouble], false, false]];
const checkedArgs = (namer !== null) ?
bldrbase.makeNamedArgs(namer, 'cts.wordQuery', 1, new Set(['text', 'options', 'weight']), paramdefs, args) :
bldrbase.makePositionalArgs('cts.wordQuery', 1, false, paramdefs, args);
Expand Down
8 changes: 7 additions & 1 deletion lib/plan-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2015-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
'use strict';

Expand Down Expand Up @@ -66,6 +66,12 @@ bldrgen.AccessPlan.prototype.col = function(...args) {
return new bldrgen.PlanColumn('op', 'col', checkedArgs);
};

bldrgen.CtsExpr.prototype.param = function(...args) {
const paramdef = ['name', [types.XsString], true, false];
const checkedArgs = bldrbase.makeSingleArgs('cts.param', 1, paramdef, args);
return new types.CtsParam('cts', 'param', checkedArgs);
};

class Builder extends bldrgen.PlanBuilder {
constructor() {
super({});
Expand Down
10 changes: 9 additions & 1 deletion lib/server-types-generated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2015-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
'use strict';

Expand Down Expand Up @@ -88,6 +88,13 @@ class CtsQuery extends Item {
super(ns, fn, args);
}

}
class CtsParam extends ServerType {

constructor(ns, fn, args) {
super(ns, fn, args);
}

}
class CtsRegion extends Item {

Expand Down Expand Up @@ -724,6 +731,7 @@ CtsPathReference: CtsPathReference,
CtsPeriod: CtsPeriod,
CtsPoint: CtsPoint,
CtsPolygon: CtsPolygon,
CtsParam: CtsParam,
CtsQuery: CtsQuery,
CtsReference: CtsReference,
CtsRegion: CtsRegion,
Expand Down
Loading
Loading