@cubejs-backend/schema-compiler 0.33.4 → 0.33.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/compiler/YamlCompiler.d.ts.map +1 -1
- package/dist/src/compiler/YamlCompiler.js +1 -1
- package/dist/src/compiler/YamlCompiler.js.map +1 -1
- package/dist/src/scaffolding/formatters/YamlSchemaFormatter.js +1 -1
- package/dist/src/scaffolding/formatters/YamlSchemaFormatter.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,qBAAa,YAAY;IAGJ,OAAO,CAAC,WAAW;IAAe,OAAO,CAAC,cAAc;IAFpE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAEjC,WAAW,EAAE,WAAW,EAAU,cAAc,EAAE,cAAc;IAGpF,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,OAAO,KAAA,EAAE,YAAY,KAAA,EAAE,SAAS,KAAA,EAAE,aAAa,KAAA;IA2BvI,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"YamlCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,qBAAa,YAAY;IAGJ,OAAO,CAAC,WAAW;IAAe,OAAO,CAAC,cAAc;IAFpE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAEjC,WAAW,EAAE,WAAW,EAAU,cAAc,EAAE,cAAc;IAGpF,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,OAAO,KAAA,EAAE,YAAY,KAAA,EAAE,SAAS,KAAA,EAAE,aAAa,KAAA;IA2BvI,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,aAAa;IAgDrB,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,4BAA4B;IAKpC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,cAAc;CAiBvB"}
|
|
@@ -107,7 +107,7 @@ class YamlCompiler {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
|
-
|
|
110
|
+
if (propertyPath[propertyPath.length - 1] === 'extends') {
|
|
111
111
|
const ast = this.parsePythonAndTranspileToJs(obj, errorsReport);
|
|
112
112
|
return this.astIntoArrowFunction(ast, obj, cubeName, name => this.cubeDictionary.resolveCube(name));
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlCompiler.js","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA2B;AAC3B,gDAAkC;AAClC,0CAAsC;AACtC,iEAA8C;AAC9C,+DAA4C;AAI5C,+CAAsG;AACtG,yDAAsD;AAGtD,mDAAkD;AAGlD,mCAAuC;AASvC,MAAa,YAAY;IAGvB,YAA2B,WAAwB,EAAU,cAA8B;QAAhE,gBAAW,GAAX,WAAW,CAAa;QAAU,mBAAc,GAAd,cAAc,CAAgB;QAFpF,uBAAkB,GAA8B,IAAI,CAAC;IAG5D,CAAC;IAEM,eAAe,CAAC,IAAiB,EAAE,YAA2B,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa;QACrI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE;YACxB,OAAO;SACR;QAED,MAAM,OAAO,GAAG,iBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACtC,IAAI,GAAG,KAAK,OAAO,EAAE;gBACnB,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;oBAClD,MAAM,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,YAAY,CAAC,CAAC;oBACrG,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;gBACzI,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,GAAG,KAAK,OAAO,EAAE;gBAC1B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;oBAClD,MAAM,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,YAAY,CAAC,CAAC;oBACrG,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;gBACzI,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,YAAY,CAAC,KAAK,CAAC,wBAAwB,GAAG,8CAA8C,CAAC,CAAC;aAC/F;SACF;IACH,CAAC;IAEO,yBAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAA2B;QACpF,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAEjE,MAAM,cAAc,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAE1G,MAAM,OAAO,GAAG,IAAA,mBAAc,EAAC,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC;QAC5D,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO;SACR,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAAC,OAAO,EAAE,YAA2B;QAC/D,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;QAEtB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QACxF,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAC9F,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QACxF,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QACtG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAE/E,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACrE,CAAC;IAEO,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,YAA2B;QAC5E,IAAI,8BAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;YAC/D,KAAK,MAAM,CAAC,IAAI,sCAAwB,EAAE;gBACxC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBACrB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;wBAClG,OAAO,IAAI,CAAC,4BAA4B,CAAC,KAAK,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;qBAC7G;yBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAClC,OAAO,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;qBAC5E;yBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBAC7B,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gCAClF,MAAM,GAAG,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gCACjE,OAAO,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;4BAClC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC5B,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;qBAC3D;iBACF;aACF;SACF;
|
|
1
|
+
{"version":3,"file":"YamlCompiler.js","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ class YamlSchemaFormatter extends BaseSchemaFormatter_1.BaseSchemaFormatter {
|
|
|
75
75
|
if (typeof value !== 'string') {
|
|
76
76
|
return value;
|
|
77
77
|
}
|
|
78
|
-
return value.match(/[{}]/) ? `"${value.replace(/"/g, '\\"')}"` : value;
|
|
78
|
+
return value.match(/[{}"]/) ? `"${value.replace(/"/g, '\\"')}"` : value;
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
exports.YamlSchemaFormatter = YamlSchemaFormatter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/YamlSchemaFormatter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"YamlSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/YamlSchemaFormatter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.33.
|
|
5
|
+
"version": "0.33.5",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"@apla/clickhouse": "^1.5.5",
|
|
60
60
|
"@cubejs-backend/linter": "^0.33.0",
|
|
61
|
-
"@cubejs-backend/query-orchestrator": "^0.33.
|
|
61
|
+
"@cubejs-backend/query-orchestrator": "^0.33.5",
|
|
62
62
|
"@types/babel__code-frame": "^7.0.2",
|
|
63
63
|
"@types/babel__generator": "^7.6.2",
|
|
64
64
|
"@types/babel__parser": "^7.1.1",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
".*\\.d\\.ts"
|
|
101
101
|
]
|
|
102
102
|
},
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "4fe2c0c912bbc75ecb6ab02f3bfa83b4dbbaa950"
|
|
104
104
|
}
|