@trapi/metadata 1.0.1 → 1.2.0

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.
Files changed (4) hide show
  1. package/dist/decorator/preset/utils/load.d.ts.map +1 -1
  2. package/dist/decorator/preset/utils/load.js +17 -11
  3. package/dist/decorator/preset/utils/load.js.map +1 -1
  4. package/package.json +2 -2
package/dist/decorator/preset/utils/load.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../../src/decorator/preset/utils/load.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlD,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAsC3E"}
1
+ {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../../src/decorator/preset/utils/load.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlD,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CA4C3E"}
package/dist/decorator/preset/utils/load.js CHANGED
@@ -16,20 +16,26 @@ async function loadPreset(input) {
16
16
  let allFailed = true;
17
17
  for (let i = 0; i < lookupPaths.length; i++) {
18
18
  try {
19
- const { value: content } = (0, locter_1.getModuleExport)(await (0, locter_1.load)(lookupPaths[i]));
20
- if ((0, check_1.isPresetSchema)(content)) {
21
- items.push(...content.items);
22
- const extendsPromises = [];
23
- if (content.extends) {
24
- for (let j = 0; j < content.extends.length; j++) {
25
- extendsPromises.push(loadPreset(content.extends[j]));
26
- }
19
+ let moduleExport = await (0, locter_1.load)(lookupPaths[i]);
20
+ if (!(0, check_1.isPresetSchema)(moduleExport)) {
21
+ if ((0, check_1.isPresetSchema)(moduleExport.default)) {
22
+ moduleExport = moduleExport.default;
27
23
  }
28
- const output = await Promise.all(extendsPromises);
29
- for (let j = 0; j < output.length; j++) {
30
- items.push(...output[j]);
24
+ else {
25
+ continue;
31
26
  }
32
27
  }
28
+ items.push(...moduleExport.items);
29
+ const extendsPromises = [];
30
+ if (moduleExport.extends) {
31
+ for (let j = 0; j < moduleExport.extends.length; j++) {
32
+ extendsPromises.push(loadPreset(moduleExport.extends[j]));
33
+ }
34
+ }
35
+ const output = await Promise.all(extendsPromises);
36
+ for (let j = 0; j < output.length; j++) {
37
+ items.push(...output[j]);
38
+ }
33
39
  allFailed = false;
34
40
  }
35
41
  catch (e) {
package/dist/decorator/preset/utils/load.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"load.js","sourceRoot":"","sources":["../../../../src/decorator/preset/utils/load.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mCAA+C;AAE/C,mCAAyC;AACzC,2CAAwD;AAEjD,KAAK,UAAU,UAAU,CAAC,KAAa;IAC1C,MAAM,KAAK,GAAuB,EAAE,CAAC;IAErC,MAAM,WAAW,GAAG,IAAA,qCAAyB,EAAC,KAAK,CAAC,CAAC;IACrD,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC;YACD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAA,wBAAe,EAAC,MAAM,IAAA,aAAI,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvE,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,EAAE,CAAC;gBAC1B,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;gBAE7B,MAAM,eAAe,GAAkC,EAAE,CAAC;gBAE1D,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC9C,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzD,CAAC;gBACL,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACrC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC;YACL,CAAC;YAED,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,iBAAiB;QACrB,CAAC;IACL,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,cAAc,KAAK,yBAAyB,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAtCD,gCAsCC"}
1
+ {"version":3,"file":"load.js","sourceRoot":"","sources":["../../../../src/decorator/preset/utils/load.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mCAA8B;AAE9B,mCAAyC;AACzC,2CAAwD;AAEjD,KAAK,UAAU,UAAU,CAAC,KAAa;IAC1C,MAAM,KAAK,GAAuB,EAAE,CAAC;IAErC,MAAM,WAAW,GAAG,IAAA,qCAAyB,EAAC,KAAK,CAAC,CAAC;IACrD,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC;YACD,IAAI,YAAY,GAAG,MAAM,IAAA,aAAI,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,CAAC,EAAE,CAAC;gBAChC,IAAI,IAAA,sBAAc,EAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;oBACvC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC;gBACxC,CAAC;qBAAM,CAAC;oBACJ,SAAS;gBACb,CAAC;YACL,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YAElC,MAAM,eAAe,GAAkC,EAAE,CAAC;YAE1D,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;gBACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACnD,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACL,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YAED,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,iBAAiB;QACrB,CAAC;IACL,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,cAAc,KAAK,yBAAyB,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AA5CD,gCA4CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trapi/metadata",
3
- "version": "1.0.1",
3
+ "version": "1.2.0",
4
4
  "description": "Generate REST-API metadata scheme from TypeScript Decorators.",
5
5
  "main": "./dist/index.js",
6
6
  "typings": "./dist/index.d.ts",
@@ -45,7 +45,7 @@
45
45
  "jsonata": "^2.0.3"
46
46
  },
47
47
  "dependencies": {
48
- "locter": "^1.2.3",
48
+ "locter": "^2.0.1",
49
49
  "minimatch": "^9.0.3"
50
50
  },
51
51
  "peerDependencies": {