@cloudbase/cals 1.0.66 → 1.0.68
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/lib/parser/cals/index.d.ts +7 -1
- package/lib/parser/cals/index.d.ts.map +1 -1
- package/lib/parser/cals/index.js +31 -2
- package/lib/parser/cals/utils/code/index.d.ts +2 -2
- package/lib/parser/cals/utils/code/index.d.ts.map +1 -1
- package/lib/parser/cals/utils/code/index.js +10 -2
- package/lib/parser/cals/utils/common.d.ts +2 -2
- package/lib/parser/cals/utils/common.d.ts.map +1 -1
- package/lib/parser/cals/utils/common.js +2 -2
- package/lib/types/platform/app.d.ts +94 -35
- package/lib/types/platform/app.d.ts.map +1 -1
- package/lib/utils/dts/index.js +3 -2
- package/package.json +3 -3
|
@@ -3,7 +3,7 @@ import { IAttributes, IPlatformApp, IPageComponent, IPlatformComponent, IDataSou
|
|
|
3
3
|
IPlatformDataSource, IDependencies, LCDS } from '../../types';
|
|
4
4
|
import { IDynamicValue, PropBindType } from '../expression';
|
|
5
5
|
import { IEventFlow } from '../../types/platform/eventFlow';
|
|
6
|
-
import { IHandler, IPlatformComponentExtra } from '../../utils';
|
|
6
|
+
import { IHandler, IPlatformSubApp, IPlatformComponentExtra } from '../../utils';
|
|
7
7
|
export { getUsedComps, generateCustomLoginConfigPathname } from './utils/common';
|
|
8
8
|
export { generateDefaultCode } from './utils/template';
|
|
9
9
|
interface IDeserializeContext {
|
|
@@ -396,6 +396,7 @@ export declare function deserializeCompositeComponent(component: ArrayElement<IP
|
|
|
396
396
|
/**
|
|
397
397
|
* page
|
|
398
398
|
* [formily] to [CALS]
|
|
399
|
+
* @deprecated 已过时，使用会产生意外错误，如不包含事件流
|
|
399
400
|
*/
|
|
400
401
|
export declare function serializeRuntimePage(ctx: Pick<ISerializeContext, 'app' | 'dependencies' | 'streamlineDefaultValue'>, page: any): IPageComponent;
|
|
401
402
|
export declare function serializeRuntimeDataset(ctx: any, dataset: any): any;
|
|
@@ -498,4 +499,9 @@ export declare function processTemplatesToDependiencies(templates?: any[]): {
|
|
|
498
499
|
schemaVersion: string;
|
|
499
500
|
};
|
|
500
501
|
export declare function generateHandlerParamsDynamicMap(handler: IHandler): any;
|
|
502
|
+
/**
|
|
503
|
+
* 精简过滤子包数据
|
|
504
|
+
* 仅保留子包自身数据
|
|
505
|
+
*/
|
|
506
|
+
export declare function streamlineSubApp(cals: any): IPlatformSubApp;
|
|
501
507
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEvH,OAAO,EACL,WAAW,EACX,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAElB,mBAAmB,EACnB,cAAc,EAAE,cAAc;AAC9B,mBAAmB,EACnB,aAAa,EACb,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAkC,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAS5F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAoC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEvH,OAAO,EACL,WAAW,EACX,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAElB,mBAAmB,EACnB,cAAc,EAAE,cAAc;AAC9B,mBAAmB,EACnB,aAAa,EACb,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAkC,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAS5F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,uBAAuB,EAAoC,MAAM,aAAa,CAAC;AAEnH,OAAO,EAAE,YAAY,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB;AAED,UAAU,iBAAiB;IACzB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACtB,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,YAAY,EACZ,KAAc,EACd,sBAAsB,GACvB,EAAE;IACD,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,CAmE3C;AAID,wBAAgB,gBAAgB,CAAC,GAAG,EAAE;IAAE,IAAI,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG;;;;;;;EAwCjH;AAED,UAAU,yBAAyB;IACjC,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,yBAAyB;;EAEnE;AAkJD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAA;CAAE,EACpC,QAAQ,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;EA4ClC;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,GAAG,WAAW,EAC3B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAO;;EAGlD;AAeD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,UAAU,GAAE,WAAgB,EAC5B,mBAAmB,KAAK;;EAiBzB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,OA4EpE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,mBAAmB,EAAE,SAAS,KAAA,MAmBvE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,gBAAgB,OAoCrF;AAED,wBAAgB,cAAc,CAAC,KAAK,KAAA,OAiBnC;AA+ND,wBAAgB,wBAAwB,CAAC,CAAC,KAAA,EAAE,IAAI,EAAE,mBAAmB;;;;;;;;EAMpE;AAuED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,iBAAiB,GACpB,CACI;IACE,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,GACD;IACE,SAAS,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAAC,CAAC;CACrD,CACJ,EACH,SAAS,EAAE;IACT,UAAU,CAAC,EAAE;QAEX,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,MAAM,CAAC,EAAE;QACP,IAAI,EAAE;YAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAA;SAAE,CAAC;QACxC,UAAU,CAAC,EAAE;YACX,IAAI,CAAC,EAAE,aAAa,CAAC;YACrB,SAAS,CAAC,EAAE,aAAa,CAAC;YAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;YACtB,QAAQ,CAAC,EAAE,aAAa,CAAC;SAC1B,CAAC;QACF,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC;QACX,SAAS,EAAE,aAAa,CAAC;QACzB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,EAAE,GAAG,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,uBAAuB,EAAE,MAAM,EAAE,CAAC;KACnC,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH,GAAG;IACF,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,IAAI,CAAC,uBAAuB,EAAE,UAAU,GAAG,UAAU,CAAC,EAC1D,KAAK,GAAE,MAAM,GAAG,WAAoB,GACnC,kBAAkB,CA2GpB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,kBAAkB,EAAE;;EAwF9F;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,cAAc,GAAG,iBAAiB,CAAC,EACxE,IAAI,EAAE,GAAG,GACR,cAAc,CAmEhB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,iBAAiB,EACtB,OAAO,GAAE;IACP,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5D;;;;;;;;;;;IAQP;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE;IACH,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAClD,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,IAAI,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkDrB;AAoBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,YAAY,CAuEd;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwEF;AAED,aAAK,YAAY,CAAC,SAAS,SAAS,SAAS,OAAO,EAAE,IAAI,SAAS,SAAS,SAAS,CAAC,MAAM,WAAW,CAAC,EAAE,GACtG,WAAW,GACX,KAAK,CAAC;AAEV,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,KAAA;;;;;;;;;;;;;EAMxG;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,cAAc,GAAG,wBAAwB,CAAC,EAC/E,IAAI,EAAE,GAAG,GACR,cAAc,CAsDhB;AAED,wBAAgB,uBAAuB,CAAC,GAAG,KAAA,EAAE,OAAO,KAAA,OAyDnD;AAWD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,iBAAiB,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,EACD,SAAS,EAAE,GAAG,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9B,kBAAkB,CAoIpB;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,GAAG,CAwBzE;AAgBD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,UAAU,CAAA;KAAE,CAAC;IAC/C,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;KAAE,CAAC;CAC1C;;;;;;;mBAIY,MAAM;mBACN,MAAM;sBACH,MAAM;;;6BACwB,OAAO;;;wBACnC,MAAM;;;;;;EAiCvB;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EACrC,SAAS,EAAE,GAA4B,EACvC,KAAK,EAAE,MAAM,OAyCd;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,OAAO,SAAK,EACZ,YAAY,QAAK,GAChB;IACD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;IACjC,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAoCA;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,iBAAiB,EAAE,EAC9B,OAAO,CAAC,EAAE;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAC5B;IACD,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,UAAU,EAAE,UAAU,EAAE,CAAC;CAC1B,CA4DA;AAED,wBAAgB,6BAA6B,CAAC,YAAY,GAAE,aAAkB,MAQ7E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,UAWvD;AAED,wBAAgB,+BAA+B,CAAC,SAAS,QAAK;;;;;;;;;;;;;;;;;QA4BtD;;;WAGG;;;;;;;EAcV;AAED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,QAAQ,OAchE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,KAAA,GAAG,eAAe,CAiBtD"}
|
package/lib/parser/cals/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.generateHandlerParamsDynamicMap = exports.processTemplatesToDependiencies = exports.parseDependenciesVersion = exports.processDependenciesVersionMap = exports.processListeners = exports.parseVersion = exports.processRuntimeCodeResources = exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimeDataset = exports.serializeRuntimePage = exports.deserializeCompositeComponent = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializeLayouts = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.normalizeQuery = exports.deserializeDataset = exports.deserializeTemplates = exports.serializeDataset = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = exports.generateDefaultCode = exports.generateCustomLoginConfigPathname = exports.getUsedComps = void 0;
|
|
17
|
+
exports.streamlineSubApp = exports.generateHandlerParamsDynamicMap = exports.processTemplatesToDependiencies = exports.parseDependenciesVersion = exports.processDependenciesVersionMap = exports.processListeners = exports.parseVersion = exports.processRuntimeCodeResources = exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimeDataset = exports.serializeRuntimePage = exports.deserializeCompositeComponent = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializeLayouts = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.normalizeQuery = exports.deserializeDataset = exports.deserializeTemplates = exports.serializeDataset = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = exports.generateDefaultCode = exports.generateCustomLoginConfigPathname = exports.getUsedComps = void 0;
|
|
18
18
|
const get_1 = __importDefault(require("lodash/get"));
|
|
19
19
|
const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
|
|
20
20
|
const unset_1 = __importDefault(require("lodash/unset"));
|
|
@@ -367,6 +367,7 @@ function serializeDataset(ctx, dataset) {
|
|
|
367
367
|
Object.entries(result.query || {}).forEach(([key, query]) => {
|
|
368
368
|
var _a, _b, _c, _d;
|
|
369
369
|
let { dataSourceName, method, listeners, handler, data, args } = query, restQuery = __rest(query, ["dataSourceName", "method", "listeners", "handler", "data", "args"]);
|
|
370
|
+
let isDeprecatedVersion = false;
|
|
370
371
|
let mergedData = (_a = serializeDynamicMapWithExtra({
|
|
371
372
|
ctx,
|
|
372
373
|
map: data || {},
|
|
@@ -376,6 +377,7 @@ function serializeDataset(ctx, dataset) {
|
|
|
376
377
|
moduleName: 'platform',
|
|
377
378
|
name: 'cloud.callDataSource',
|
|
378
379
|
};
|
|
380
|
+
isDeprecatedVersion = true;
|
|
379
381
|
mergedData = {
|
|
380
382
|
dataSourceName,
|
|
381
383
|
methodName: method === null || method === void 0 ? void 0 : method.name,
|
|
@@ -394,7 +396,10 @@ function serializeDataset(ctx, dataset) {
|
|
|
394
396
|
name: handler === null || handler === void 0 ? void 0 : handler.name,
|
|
395
397
|
':code': handler === null || handler === void 0 ? void 0 : handler.code,
|
|
396
398
|
};
|
|
397
|
-
if (
|
|
399
|
+
if (isDeprecatedVersion) {
|
|
400
|
+
processedHandler.params = mergedData;
|
|
401
|
+
}
|
|
402
|
+
else if (mergedData && data) {
|
|
398
403
|
processedHandler.params = mergedData;
|
|
399
404
|
}
|
|
400
405
|
else {
|
|
@@ -1038,6 +1043,7 @@ exports.deserializeCompositeComponent = deserializeCompositeComponent;
|
|
|
1038
1043
|
/**
|
|
1039
1044
|
* page
|
|
1040
1045
|
* [formily] to [CALS]
|
|
1046
|
+
* @deprecated 已过时，使用会产生意外错误，如不包含事件流
|
|
1041
1047
|
*/
|
|
1042
1048
|
function serializeRuntimePage(ctx, page) {
|
|
1043
1049
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -1478,3 +1484,26 @@ function generateHandlerParamsDynamicMap(handler) {
|
|
|
1478
1484
|
return handerParam;
|
|
1479
1485
|
}
|
|
1480
1486
|
exports.generateHandlerParamsDynamicMap = generateHandlerParamsDynamicMap;
|
|
1487
|
+
/**
|
|
1488
|
+
* 精简过滤子包数据
|
|
1489
|
+
* 仅保留子包自身数据
|
|
1490
|
+
*/
|
|
1491
|
+
function streamlineSubApp(cals) {
|
|
1492
|
+
const { schemaVersion, id, name, description, label, main, items = [], extra } = cals;
|
|
1493
|
+
const { originHistoryId, pageTree, rootPath } = extra;
|
|
1494
|
+
return {
|
|
1495
|
+
schemaVersion,
|
|
1496
|
+
id,
|
|
1497
|
+
name,
|
|
1498
|
+
label,
|
|
1499
|
+
description,
|
|
1500
|
+
main,
|
|
1501
|
+
items,
|
|
1502
|
+
extra: {
|
|
1503
|
+
pageTree,
|
|
1504
|
+
originHistoryId,
|
|
1505
|
+
rootPath,
|
|
1506
|
+
},
|
|
1507
|
+
};
|
|
1508
|
+
}
|
|
1509
|
+
exports.streamlineSubApp = streamlineSubApp;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* cals 与 code 互转
|
|
3
3
|
* 这里的 code 是中间状态的 code，即非最终生成的可运行的项目代码
|
|
4
4
|
*/
|
|
5
|
-
import { IPlatformApp } from '../../../../types';
|
|
5
|
+
import { IPlatformApp, IPlatformSubApp } from '../../../../types';
|
|
6
6
|
export interface ICodeItem {
|
|
7
7
|
path: string;
|
|
8
8
|
code: string;
|
|
@@ -13,7 +13,7 @@ export interface ICodeItem {
|
|
|
13
13
|
*
|
|
14
14
|
* @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
|
|
15
15
|
*/
|
|
16
|
-
export declare function calsToCode(calsJSON: IPlatformApp, version?: 'v0' | 'v1'): ICodeItem[];
|
|
16
|
+
export declare function calsToCode(calsJSON: IPlatformApp | IPlatformSubApp, version?: 'v0' | 'v1'): ICodeItem[];
|
|
17
17
|
/**
|
|
18
18
|
* 中间状态的代码 转成 CALS
|
|
19
19
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,YAAY,EAMZ,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,eAAe,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CA2M7G;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA+J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,gBAAgB,GAAE,OAAe,GAChC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CAoClD"}
|
|
@@ -94,6 +94,13 @@ function calsToCode(calsJSON, version = 'v1') {
|
|
|
94
94
|
'rootPath',
|
|
95
95
|
'themeVars',
|
|
96
96
|
'originHistoryId',
|
|
97
|
+
'enableLoading',
|
|
98
|
+
'statusPageId',
|
|
99
|
+
'disabled',
|
|
100
|
+
'enableAsyncMaterials',
|
|
101
|
+
'clientId',
|
|
102
|
+
'loginConfigVersion',
|
|
103
|
+
'enableLoginStatusShare',
|
|
97
104
|
// 额外添加，非标准
|
|
98
105
|
'pages',
|
|
99
106
|
'processPages',
|
|
@@ -149,7 +156,7 @@ function calsToCode(calsJSON, version = 'v1') {
|
|
|
149
156
|
.forEach((key) => (newConfig[key] = config[key]));
|
|
150
157
|
addCodeItem(configPath, JSON.stringify(config, null, 2));
|
|
151
158
|
}
|
|
152
|
-
function genCode(resources, basePath = '') {
|
|
159
|
+
function genCode(resources = [], basePath = '') {
|
|
153
160
|
const codeResources = (resources || []).filter((item) => item.type === types_1.EResourceType.CODE && item.name !== types_1.ECodeName.PLACEHOLDER);
|
|
154
161
|
codeResources.forEach((codeItem) => {
|
|
155
162
|
let codePath = '';
|
|
@@ -300,7 +307,7 @@ function codeToCals(codeList, version = 'v1') {
|
|
|
300
307
|
case 'lifecycle.js':
|
|
301
308
|
resources.push(Object.assign({ name: types_1.ECodeType.LIFECYCLE, path: `${_pageId}/${types_1.ECodeType.LIFECYCLE}`, codeType: types_1.ECodeType.LIFECYCLE }, commonVal));
|
|
302
309
|
break;
|
|
303
|
-
default:
|
|
310
|
+
default: {
|
|
304
311
|
// page handler
|
|
305
312
|
const handlerMatches = relativePath.match(/^handler\/([^/]*?).js$/);
|
|
306
313
|
if (handlerMatches) {
|
|
@@ -314,6 +321,7 @@ function codeToCals(codeList, version = 'v1') {
|
|
|
314
321
|
(_b = calsJSON.resources) === null || _b === void 0 ? void 0 : _b.push(Object.assign({ name, path: `${_pageId}/common/${name}`, codeType: types_1.ECodeType.NORMAL_MODULE }, commonVal));
|
|
315
322
|
}
|
|
316
323
|
break;
|
|
324
|
+
}
|
|
317
325
|
}
|
|
318
326
|
}
|
|
319
327
|
function isPageFile(filePath) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IPlatformApp } from '../../../types';
|
|
1
|
+
import { IPlatformApp, IPlatformSubApp } from '../../../types';
|
|
2
2
|
import { IDataBind } from '../../expression/index';
|
|
3
3
|
declare type IUsedComponentResources = {
|
|
4
4
|
[libName: string]: Set<string>;
|
|
@@ -8,7 +8,7 @@ export declare function isPlainObject(src: any): boolean;
|
|
|
8
8
|
export declare const isEmptyObj: (obj: object) => boolean;
|
|
9
9
|
export declare function isValidStyleBind(styleBind: IDataBind): boolean;
|
|
10
10
|
export declare function isValidClassNameListBind(classNameListBind: IDataBind): boolean;
|
|
11
|
-
export declare function getUsedComps(apps: IPlatformApp[], dependencies: any[], options?: {
|
|
11
|
+
export declare function getUsedComps(apps: (IPlatformApp | IPlatformSubApp)[], dependencies: any[], options?: {
|
|
12
12
|
withAction?: boolean;
|
|
13
13
|
/**
|
|
14
14
|
* templates 按需引入
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,YAAY,EAAsB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,YAAY,EAAE,eAAe,EAAsB,MAAM,gBAAgB,CAAC;AAEnG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsBnD,aAAK,uBAAuB,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAOlE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAQ,UAQ5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,YAUrC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE;AAyJD,wBAAgB,YAAY,CAE1B,IAAI,EAAE,CAAC,YAAY,GAAG,eAAe,CAAC,EAAE,EAExC,YAAY,EAAE,GAAG,EAAE,EACnB,OAAO,CAAC,EAAE;IACR,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,GACA,uBAAuB,GAAG;IAAE,SAAS,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CA+EvG;AAED,wBAAgB,iCAAiC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,UAMvG"}
|
|
@@ -197,7 +197,7 @@ apps,
|
|
|
197
197
|
// 分库后的组件库 denpendienicy
|
|
198
198
|
dependencies, options) {
|
|
199
199
|
const { streamline = false, withAction = false } = options || {};
|
|
200
|
-
const { templates = [] } = (apps === null || apps === void 0 ? void 0 : apps[0]) || {};
|
|
200
|
+
const { templates = [] } = ((apps === null || apps === void 0 ? void 0 : apps[0]) || {});
|
|
201
201
|
const comps = streamline && templates.length ? [...dependencies, (0, index_1.processTemplatesToDependiencies)(templates)] : dependencies;
|
|
202
202
|
// 1. 寻找应用内容里用到的所有组件
|
|
203
203
|
// 1.1 寻找主子应用各自的内容里所用到的组件
|
|
@@ -268,7 +268,7 @@ dependencies, options) {
|
|
|
268
268
|
exports.getUsedComps = getUsedComps;
|
|
269
269
|
function generateCustomLoginConfigPathname({ appId, version }) {
|
|
270
270
|
const hashVersion = version.split('_')[0];
|
|
271
|
-
const pathname = `/${hashVersion === 'v1' ? '__auth/app' : ''}${appId}/login.config${version ? `.${version}` : ''}.json`;
|
|
271
|
+
const pathname = `/${hashVersion === 'v1' ? '__auth/app/' : ''}${appId}/login.config${version ? `.${version}` : ''}.json`;
|
|
272
272
|
return pathname;
|
|
273
273
|
}
|
|
274
274
|
exports.generateCustomLoginConfigPathname = generateCustomLoginConfigPathname;
|
|
@@ -3,7 +3,6 @@ import { ICodeResource, IPlatformDataset } from './common';
|
|
|
3
3
|
import { IComplexComponent, IPageComponent } from './component';
|
|
4
4
|
import { IDataSourceVariable, IPlatformDataSource } from './datasource';
|
|
5
5
|
import { type ITheme } from './theme';
|
|
6
|
-
import { IEvents } from '../basic/component';
|
|
7
6
|
import { LCDS } from '../index';
|
|
8
7
|
export declare enum EExternalResourceType {
|
|
9
8
|
JSUrl = "jsUrl",
|
|
@@ -61,6 +60,13 @@ export interface IPlatformApp extends Omit<Basic.IApp, 'attributes' | 'events' |
|
|
|
61
60
|
/** 应用主题 */
|
|
62
61
|
theme?: ITheme;
|
|
63
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* 类型修改同步修改 parse 方法
|
|
65
|
+
* /src/parser/cals/index.ts
|
|
66
|
+
*/
|
|
67
|
+
export interface IPlatformSubApp extends Pick<IPlatformApp, 'schemaVersion' | 'id' | 'name' | 'description' | 'label' | 'main' | 'items'> {
|
|
68
|
+
extra?: IBasePlatformAppExtra & IBaseEditorPlatformAppExtra;
|
|
69
|
+
}
|
|
64
70
|
/**
|
|
65
71
|
* 格式和npm一样
|
|
66
72
|
* 格式：{ '@命名空间/组件库名称': <protocal>:<path>?v=<版本号> } 遵循URL规范
|
|
@@ -84,7 +90,11 @@ export interface IPlatformApp extends Omit<Basic.IApp, 'attributes' | 'events' |
|
|
|
84
90
|
export declare type IDependencies = {
|
|
85
91
|
[key: string]: string;
|
|
86
92
|
};
|
|
87
|
-
|
|
93
|
+
/**
|
|
94
|
+
* 新增持久化数据必须同步修改
|
|
95
|
+
* src/parser/cals/utils/code/index.ts
|
|
96
|
+
*/
|
|
97
|
+
export interface IPlatformAppExtra extends IEditorPlatformAppExtra, IBasePlatformAppExtra {
|
|
88
98
|
/**
|
|
89
99
|
* 应用统一路由模式
|
|
90
100
|
*/
|
|
@@ -96,14 +106,12 @@ export interface IPlatformAppExtra {
|
|
|
96
106
|
[key: string]: string;
|
|
97
107
|
};
|
|
98
108
|
/**
|
|
109
|
+
* @deprecated
|
|
99
110
|
* 预设色彩值
|
|
100
111
|
*/
|
|
101
112
|
presetColors?: string[];
|
|
102
113
|
/**
|
|
103
|
-
*
|
|
104
|
-
*/
|
|
105
|
-
maxID?: number;
|
|
106
|
-
/**
|
|
114
|
+
* @deprecated
|
|
107
115
|
* 小程序插件
|
|
108
116
|
*/
|
|
109
117
|
plugins?: {
|
|
@@ -114,10 +122,7 @@ export interface IPlatformAppExtra {
|
|
|
114
122
|
version: string;
|
|
115
123
|
}[];
|
|
116
124
|
/**
|
|
117
|
-
*
|
|
118
|
-
*/
|
|
119
|
-
rootPath?: string | null;
|
|
120
|
-
/**
|
|
125
|
+
* @deprecated
|
|
121
126
|
* 主题定义
|
|
122
127
|
*/
|
|
123
128
|
themeVars?: {
|
|
@@ -142,23 +147,6 @@ export interface IPlatformAppExtra {
|
|
|
142
147
|
* 当前页面静态资源域名（html、图片等静态资源）
|
|
143
148
|
*/
|
|
144
149
|
domain?: string;
|
|
145
|
-
/**
|
|
146
|
-
* 隐藏插槽配置
|
|
147
|
-
*/
|
|
148
|
-
compHiddenConfig?: {
|
|
149
|
-
[pageId: string]: string[];
|
|
150
|
-
};
|
|
151
|
-
/**
|
|
152
|
-
* 基准历史ID
|
|
153
|
-
*/
|
|
154
|
-
originHistoryId?: string;
|
|
155
|
-
/**
|
|
156
|
-
* 组件库上个版本信息。格式为:
|
|
157
|
-
* { @tcwd/CLOUDBASE_BUSSINESS: "weda:components?v=1.22.3&updateTime=1662369434696", @tcwd/CLOUDBASE_STANDARD: "weda:components?v=1.4.2&updateTime=1662369434696"}
|
|
158
|
-
*/
|
|
159
|
-
lastDependencies?: {
|
|
160
|
-
[key: string]: string;
|
|
161
|
-
};
|
|
162
150
|
/**
|
|
163
151
|
* 是否开启默认loading
|
|
164
152
|
*/
|
|
@@ -176,27 +164,98 @@ export interface IPlatformAppExtra {
|
|
|
176
164
|
*/
|
|
177
165
|
enableAsyncMaterials?: boolean;
|
|
178
166
|
/**
|
|
179
|
-
*
|
|
167
|
+
* idaas 登录态区分标识
|
|
168
|
+
*/
|
|
169
|
+
clientId?: string;
|
|
170
|
+
/**
|
|
171
|
+
* 登录设置
|
|
180
172
|
*/
|
|
181
173
|
loginConfigVersion?: string;
|
|
174
|
+
/**
|
|
175
|
+
* 登录态共享
|
|
176
|
+
*/
|
|
177
|
+
enableLoginStatusShare?: boolean;
|
|
182
178
|
}
|
|
183
|
-
|
|
179
|
+
interface IBasePlatformAppExtra {
|
|
184
180
|
/**
|
|
185
|
-
*
|
|
181
|
+
* 小程序子包名 或 web 子页面路径
|
|
186
182
|
*/
|
|
187
|
-
|
|
183
|
+
rootPath?: string | null;
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* 新增持久化数据必须同步修改
|
|
187
|
+
* src/parser/cals/utils/code/index.ts
|
|
188
|
+
*/
|
|
189
|
+
interface IEditorPlatformAppExtra extends IBaseEditorPlatformAppExtra {
|
|
188
190
|
/**
|
|
189
|
-
*
|
|
191
|
+
* 是否显示条件渲染
|
|
190
192
|
*/
|
|
191
|
-
|
|
193
|
+
conditionalRendering?: Boolean;
|
|
192
194
|
/**
|
|
193
|
-
*
|
|
195
|
+
* 组件库上个版本信息。格式为:
|
|
196
|
+
* { @tcwd/CLOUDBASE_BUSSINESS: "weda:components?v=1.22.3&updateTime=1662369434696", @tcwd/CLOUDBASE_STANDARD: "weda:components?v=1.4.2&updateTime=1662369434696"}
|
|
194
197
|
*/
|
|
195
|
-
|
|
198
|
+
lastDependencies?: {
|
|
199
|
+
[key: string]: string;
|
|
200
|
+
};
|
|
201
|
+
/**
|
|
202
|
+
* 流程页面
|
|
203
|
+
*/
|
|
204
|
+
processPages?: {
|
|
205
|
+
/**
|
|
206
|
+
* 页面id
|
|
207
|
+
*/
|
|
208
|
+
id: string;
|
|
209
|
+
label: string;
|
|
210
|
+
/**
|
|
211
|
+
* 审批结点id
|
|
212
|
+
*/
|
|
213
|
+
nodeId: string;
|
|
214
|
+
nodeName: string;
|
|
215
|
+
inputNode: string[];
|
|
216
|
+
outputNode: string[];
|
|
217
|
+
/**
|
|
218
|
+
* 流程id
|
|
219
|
+
*/
|
|
220
|
+
processKey: string;
|
|
221
|
+
processName: string;
|
|
222
|
+
}[];
|
|
223
|
+
}
|
|
224
|
+
/**
|
|
225
|
+
* 新增持久化数据必须同步修改
|
|
226
|
+
* src/parser/cals/utils/code/index.ts
|
|
227
|
+
*/
|
|
228
|
+
interface IBaseEditorPlatformAppExtra {
|
|
229
|
+
/**
|
|
230
|
+
* 基准历史ID
|
|
231
|
+
*/
|
|
232
|
+
originHistoryId?: string;
|
|
233
|
+
/**
|
|
234
|
+
* 应用页面分组
|
|
235
|
+
*/
|
|
236
|
+
pageTree?: {
|
|
237
|
+
id: string;
|
|
238
|
+
label: string;
|
|
239
|
+
type: 'page' | 'folder';
|
|
240
|
+
items?: any[];
|
|
241
|
+
}[];
|
|
242
|
+
/**
|
|
243
|
+
* @deprecated
|
|
244
|
+
* 大纲树alias数据补充
|
|
245
|
+
*/
|
|
246
|
+
componentPropsDatas?: any[];
|
|
247
|
+
/**
|
|
248
|
+
* 隐藏设计态显示组件
|
|
249
|
+
* @deprecated
|
|
250
|
+
*/
|
|
251
|
+
compHiddenConfig?: {
|
|
252
|
+
[pageId: string]: string[];
|
|
253
|
+
};
|
|
196
254
|
}
|
|
197
255
|
export interface IExternalResource {
|
|
198
256
|
type: EExternalResourceType;
|
|
199
257
|
url?: string;
|
|
200
258
|
code?: string;
|
|
201
259
|
}
|
|
260
|
+
export {};
|
|
202
261
|
//# sourceMappingURL=app.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/types/platform/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAuC,MAAM,UAAU,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/types/platform/app.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/dts/index.js
CHANGED
|
@@ -302,11 +302,12 @@ function _generateOneItemDTS(inputData, itemType) {
|
|
|
302
302
|
* 获取用于显示的数据类型（仅有 number, string , boolean, array, object 等内置基础类型）
|
|
303
303
|
*/
|
|
304
304
|
function getDisplayReturnType(typeStr) {
|
|
305
|
+
var _a, _b;
|
|
305
306
|
let displayType = typeStr.trim();
|
|
306
|
-
if (displayType.endsWith('[]')) {
|
|
307
|
+
if ((_a = displayType === null || displayType === void 0 ? void 0 : displayType.endsWith) === null || _a === void 0 ? void 0 : _a.call(displayType, '[]')) {
|
|
307
308
|
displayType = 'array';
|
|
308
309
|
}
|
|
309
|
-
else if (displayType.endsWith('}')) {
|
|
310
|
+
else if ((_b = displayType === null || displayType === void 0 ? void 0 : displayType.endsWith) === null || _b === void 0 ? void 0 : _b.call(displayType, '}')) {
|
|
310
311
|
displayType = 'object';
|
|
311
312
|
}
|
|
312
313
|
return displayType;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/cals",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.68",
|
|
4
4
|
"description": "Common application specifications",
|
|
5
5
|
"main": "lib/utils/index.js",
|
|
6
6
|
"source": "src/utils/index.ts",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"tinycolor2": "^1.6.0"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@tcwd/dev-tools": "
|
|
48
|
+
"@tcwd/dev-tools": "workspace:^",
|
|
49
49
|
"@types/acorn": "^4.0.5",
|
|
50
50
|
"@types/jest": "^27.4.0",
|
|
51
51
|
"@types/lodash": "^4.14.168",
|
|
@@ -62,4 +62,4 @@
|
|
|
62
62
|
"typescript": "^4.7.4",
|
|
63
63
|
"typescript-json-schema": "^0.53.0"
|
|
64
64
|
}
|
|
65
|
-
}
|
|
65
|
+
}
|