Skip to content

fix(mql-typescript): use mql-specifications repository #622

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

Draft
addaleax wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(mql-typescript): use mql-specifications repository #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "packages/mql-typescript/mongo-php-library"]
path = packages/mql-typescript/mongo-php-library
url = https://github.com/mongodb-js/mongo-php-library
[submodule "packages/mql-typescript/mql-specifications"]
path = packages/mql-typescript/mql-specifications
url = https://github.com/mongodb/mql-specifications.git
1 change: 0 additions & 1 deletion packages/mql-typescript/mongo-php-library
Open in desktop
Submodule mongo-php-library deleted from 4a2867
1 change: 1 addition & 0 deletions packages/mql-typescript/mql-specifications
Open in desktop
Submodule mql-specifications added at 679836
466 changes: 367 additions & 99 deletions packages/mql-typescript/out/schema.d.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/mql-typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"check-ci": "npm run check",
"test": "tsc --noEmit tests/**/*.ts",
"reformat": "npm run prettier -- --write .",
"extract-metaschema": "json-refs resolve mongo-php-library/generator/config/schema.json | json-schema-to-zod -n Operator -o src/metaschema.ts && npm run prettier -- --write src/metaschema.ts",
"extract-metaschema": "json-refs resolve mql-specifications/schema.json | json-schema-to-zod -n Operator -o src/metaschema.ts && npm run prettier -- --write src/metaschema.ts",
"pregenerate-schema": "npm run extract-metaschema",
"generate-schema": "ts-node src/cli.ts schema",
"postgenerate-schema": "npm run prettier -- --write out/*",
Expand All @@ -66,7 +66,7 @@
"postgenerate-tests": "npm run prettier -- --write tests/**/*.ts",
"pregenerate-driver-schema": "npm run extract-metaschema",
"generate-driver-schema": "ts-node src/cli.ts driver-schema",
"postgenerate-driver-schema": "yamlfix -c mongo-php-library/generator/config/.yamlfix.toml mongo-php-library/generator/config",
"postgenerate-driver-schema": "yamlfix -c mql-specifications/.yamlfix.toml mql-specifications/definitions",
"format-generated-files": "npm run postgenerate-schema && npm run postgenerate-tests && npm run postgenerate-driver-schema"
},
"devDependencies": {
Expand Down
5 changes: 2 additions & 3 deletions packages/mql-typescript/src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,8 @@ export abstract class GeneratorBase {
protected configDir = path.join(
__dirname,
'..',
'mongo-php-library',
'generator',
'config',
'mql-specifications',
'definitions',
);

private async *listCategories(
Expand Down
28 changes: 18 additions & 10 deletions packages/mql-typescript/src/metaschema.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/mql-typescript/src/schema-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ export class SchemaGenerator extends GeneratorBase {
'UnprefixedFieldPath<S>[]',
'{ wildcard: string }',
],
bitwiseOperation: [
'({ and: Int | Long } | { or: Int | Long } | { xor: Int | Long })',
],
searchScore: ['unknown'],
granularity: ['string'],
fullDocument: ['string'],
Expand Down
Loading