@common-stack/rollup-vite-utils 8.0.2-alpha.1 → 8.2.1-alpha.1
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/LICENSE +34 -21
- package/lib/config-schema.cjs +104 -103
- package/lib/config-schema.cjs.map +1 -1
- package/lib/config-schema.js +104 -103
- package/lib/config-schema.js.map +1 -1
- package/lib/index.cjs +1 -1
- package/lib/index.js +1 -1
- package/lib/preStartup/configLoader/configLoader.cjs +135 -2
- package/lib/preStartup/configLoader/configLoader.cjs.map +1 -1
- package/lib/preStartup/configLoader/configLoader.js +135 -2
- package/lib/preStartup/configLoader/configLoader.js.map +1 -1
- package/lib/preStartup/configLoader/index.cjs +1 -1
- package/lib/preStartup/configLoader/index.cjs.map +1 -1
- package/lib/preStartup/configLoader/index.js +1 -1
- package/lib/preStartup/configLoader/index.js.map +1 -1
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.cjs +6 -2
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.cjs.map +1 -1
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.js +6 -2
- package/lib/rollup/modifyLibFiles/extractGraphQLQueries.js.map +1 -1
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.cjs +2 -3
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.cjs.map +1 -1
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.js +2 -3
- package/lib/rollup/modifyLibFiles/handleComponentOrDialog.js.map +1 -1
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.cjs +2 -4
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.cjs.map +1 -1
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.js +2 -4
- package/lib/rollup/modifyLibFiles/handleLoaderReturn.js.map +1 -1
- package/lib/rollup/rollupPluginAddJsExtension.cjs +1 -1
- package/lib/rollup/rollupPluginAddJsExtension.cjs.map +1 -1
- package/lib/rollup/rollupPluginAddJsExtension.js +1 -1
- package/lib/rollup/rollupPluginAddJsExtension.js.map +1 -1
- package/lib/rollup/rollupPluginGenerateJson.cjs +27 -0
- package/lib/rollup/rollupPluginGenerateJson.cjs.map +1 -1
- package/lib/rollup/rollupPluginGenerateJson.d.ts +10 -0
- package/lib/rollup/rollupPluginGenerateJson.js +27 -0
- package/lib/rollup/rollupPluginGenerateJson.js.map +1 -1
- package/lib/rollup/rollupPluginGenerateJson.test.d.ts +1 -0
- package/lib/rollup/rollupPluginUpdateFromConfig.cjs +1 -1
- package/lib/rollup/rollupPluginUpdateFromConfig.js +1 -1
- package/lib/tools/codegen/generateCodegenConfig.cjs +30 -0
- package/lib/tools/codegen/generateCodegenConfig.cjs.map +1 -1
- package/lib/tools/codegen/generateCodegenConfig.js +30 -0
- package/lib/tools/codegen/generateCodegenConfig.js.map +1 -1
- package/lib/tools/codegen/index.cjs.map +1 -1
- package/lib/tools/codegen/index.js.map +1 -1
- package/lib/tools/codegen/performCopyOperations.cjs +94 -17
- package/lib/tools/codegen/performCopyOperations.cjs.map +1 -1
- package/lib/tools/codegen/performCopyOperations.js +94 -17
- package/lib/tools/codegen/performCopyOperations.js.map +1 -1
- package/lib/tools/codegen/readModules.cjs +80 -59
- package/lib/tools/codegen/readModules.cjs.map +1 -1
- package/lib/tools/codegen/readModules.d.ts +0 -18
- package/lib/tools/codegen/readModules.js +80 -59
- package/lib/tools/codegen/readModules.js.map +1 -1
- package/lib/tools/codegen/setupCommonPackage.cjs +14 -5
- package/lib/tools/codegen/setupCommonPackage.cjs.map +1 -1
- package/lib/tools/codegen/setupCommonPackage.d.ts +1 -1
- package/lib/tools/codegen/setupCommonPackage.js +14 -5
- package/lib/tools/codegen/setupCommonPackage.js.map +1 -1
- package/lib/tools/codegen/templates/common/package.json.template +2 -0
- package/lib/tools/codegen/templates/common/scripts/fix-generated-types.js.template +58 -0
- package/lib/tools/codegen/templates/common/src/apollo-context.ts.bk.template +34 -0
- package/lib/tools/codegen/templates/common/src/apollo-context.ts.template +13 -20
- package/lib/tools/codegen/templates/common/src/client-context.ts.template +19 -0
- package/lib/tools/codegen/templates/common/src/core/disposable.ts.template +93 -0
- package/lib/tools/codegen/templates/common/src/core/event.test.ts +16 -0
- package/lib/tools/codegen/templates/common/src/core/event.ts.template +326 -0
- package/lib/tools/codegen/templates/common/src/core/index.ts.template +3 -0
- package/lib/tools/codegen/templates/common/src/core/types.ts.template +1 -0
- package/lib/tools/codegen/templates/common/src/generated/service-schemas.ts.template +1 -0
- package/lib/tools/codegen/templates/common/src/index.server.ts.template +3 -1
- package/lib/tools/codegen/templates/common/src/index.ts.template +1 -0
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/packageUtils.cjs +142 -2
- package/lib/utils/packageUtils.cjs.map +1 -1
- package/lib/utils/packageUtils.d.ts +65 -0
- package/lib/utils/packageUtils.js +142 -2
- package/lib/utils/packageUtils.js.map +1 -1
- package/lib/utils/utils.cjs +1 -1
- package/lib/utils/utils.js +1 -1
- package/lib/vite-wrappers/generators/clientLoaderGenerator.cjs +11 -3
- package/lib/vite-wrappers/generators/clientLoaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js +11 -3
- package/lib/vite-wrappers/generators/clientLoaderGenerator.js.map +1 -1
- package/lib/vite-wrappers/generators/loaderGenerator.cjs +7 -16
- package/lib/vite-wrappers/generators/loaderGenerator.cjs.map +1 -1
- package/lib/vite-wrappers/generators/loaderGenerator.d.ts +1 -0
- package/lib/vite-wrappers/generators/loaderGenerator.js +7 -16
- package/lib/vite-wrappers/generators/loaderGenerator.js.map +1 -1
- package/lib/vite-wrappers/generators/utils/resourceParams.cjs +48 -11
- package/lib/vite-wrappers/generators/utils/resourceParams.cjs.map +1 -1
- package/lib/vite-wrappers/generators/utils/resourceParams.d.ts +10 -4
- package/lib/vite-wrappers/generators/utils/resourceParams.js +48 -11
- package/lib/vite-wrappers/generators/utils/resourceParams.js.map +1 -1
- package/lib/vite-wrappers/icon-switch.cjs +4 -4
- package/lib/vite-wrappers/icon-switch.cjs.map +1 -1
- package/lib/vite-wrappers/icon-switch.js +4 -4
- package/lib/vite-wrappers/icon-switch.js.map +1 -1
- package/lib/vite-wrappers/json-wrappers.cjs +30 -2
- package/lib/vite-wrappers/json-wrappers.cjs.map +1 -1
- package/lib/vite-wrappers/json-wrappers.js +30 -2
- package/lib/vite-wrappers/json-wrappers.js.map +1 -1
- package/lib/vite-wrappers/wrapperComponent.cjs +6 -13
- package/lib/vite-wrappers/wrapperComponent.cjs.map +1 -1
- package/lib/vite-wrappers/wrapperComponent.js +6 -13
- package/lib/vite-wrappers/wrapperComponent.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readModules.js","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"
|
|
1
|
+
{"version":3,"file":"readModules.js","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"uMAAA;AACA;AAQA;AACA,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAkBlD;;;AAGG;AACH,SAAS,kBAAkB,CAAC,UAAkB,EAAA;IAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAACA,aAAI,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK,EAAE;QACnC,KAAK,CAAC,GAAG,EAAE,CAAC;KACf;IACD,OAAO,KAAK,CAAC,IAAI,CAACA,aAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED;;;;AAIG;AACH,SAAS,oBAAoB,CAAC,OAAe,EAAA;IACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAACA,aAAI,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACzD,IAAA,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;QACrE,QAAQ,CAAC,GAAG,EAAE,CAAC;KAClB;IACD,OAAO,QAAQ,CAAC,IAAI,CAACA,aAAI,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAED;;;AAGG;AACH,SAAS,gBAAgB,CAAC,GAAqB,EAAA;AAC3C,IAAA,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAACA,aAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC;AAC1D,CAAC;AAED;;;;;;;;;;;;;;AAcG;AACH,SAAS,gBAAgB,CAAC,OAA2B,EAAA;IACjD,MAAM,WAAW,GAAU,EAAE,CAAC;AAC9B,IAAA,MAAM,aAAa,GAAG,IAAI,GAAG,EAAe,CAAC;AAE7C,IAAA,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,KAAI;AACpB,QAAA,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE;;YAEvB,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;;AAE/B,gBAAA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBAC/C,WAAW,CAAC,IAAI,CAAC;oBACb,MAAM,EAAE,CAAG,EAAA,IAAI,CAAa,WAAA,CAAA;oBAC5B,IAAI,EAAE,CAAG,EAAA,IAAI,CAAW,SAAA,CAAA;oBACxB,OAAO,EAAE,CAAG,EAAA,IAAI,CAAc,YAAA,CAAA;AACjC,iBAAA,CAAC,CAAC;aACN;iBAAM,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;AACrC,gBAAA,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAG,EAAA,GAAG,CAAC,IAAI,CAAM,IAAA,CAAA,EAAE,CAAC,CAAC;aACnD;iBAAM;AACH,gBAAA,WAAW,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAG,EAAA,GAAG,CAAC,IAAI,CAAM,IAAA,CAAA,EAAE,CAAC,CAAC;aACxD;SACJ;aAAM;;AAEH,YAAA,IAAI,GAAG,CAAC,kBAAkB,EAAE;AACxB,gBAAA,WAAW,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAG,EAAA,GAAG,CAAC,IAAI,CAAM,IAAA,CAAA,EAAE,CAAC,CAAC;aACxD;iBAAM;gBACH,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;AAC/B,oBAAA,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE;wBACzB,MAAM,EAAE,CAAG,EAAA,SAAS,CAAa,WAAA,CAAA;wBACjC,IAAI,EAAE,CAAG,EAAA,SAAS,CAAW,SAAA,CAAA;wBAC7B,OAAO,EAAE,CAAG,EAAA,SAAS,CAAc,YAAA,CAAA;wBACnC,MAAM,EAAE,CAAG,EAAA,SAAS,CAAa,WAAA,CAAA;AACpC,qBAAA,CAAC,CAAC;iBACN;aACJ;SACJ;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,CAAC,GAAG,WAAW,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AACnE,CAAC;AA4Fe,SAAA,WAAW,CAAC,WAAA,GAAwB,EAAE,EAAA;AAClD,IAAA,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;;AAGvC,IAAA,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,KAAI;QAC/B,IAAI,CAACC,WAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;AAC5B,YAAA,OAAO,CAAC,KAAK,CAAC,0BAA0B,UAAU,CAAA,CAAE,CAAC,CAAC;AACtD,YAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;AACD,QAAA,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAACA,WAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAEpE,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,GAAW,KAAK,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3E,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,GAAW,KAAK,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACnF,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,GAAW,KAAK,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAClF,KAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAuB,EAAE,CAAC;;AAGhD,IAAA,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,KAAI;AAC5B,QAAA,IAAI;;AAEA,YAAA,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;;YAG5E,IAAI,YAAY,GAAkB,IAAI,CAAC;AACvC,YAAA,IAAI,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;AACxC,gBAAA,MAAM,SAAS,GAAGD,aAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;AACnE,gBAAA,IAAIC,WAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC1B,YAAY,GAAG,SAAS,CAAC;iBAC5B;qBAAM;;AAEH,oBAAA,MAAM,YAAY,GAAGD,aAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;AAC7E,oBAAA,IAAIC,WAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;wBAC7B,YAAY,GAAG,YAAY,CAAC;qBAC/B;iBACJ;aACJ;iBAAM;AACH,gBAAA,YAAY,GAAG,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE;oBAClD,QAAQ,EAAE,WAAW,CAAC,QAAQ;AACjC,iBAAA,CAAC,CAAC;gBACH,IAAI,CAAC,YAAY,EAAE;;oBAEf,MAAM,eAAe,GAAG,MAAM;yBACzB,KAAK,CAAC,GAAG,CAAC;AACV,yBAAA,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;yBACxC,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,oBAAA,IAAI,eAAe,KAAK,MAAM,EAAE;AAC5B,wBAAA,YAAY,GAAG,kBAAkB,CAAC,eAAe,EAAE,UAAU,EAAE;4BAC3D,QAAQ,EAAE,WAAW,CAAC,QAAQ;AACjC,yBAAA,CAAC,CAAC;qBACN;iBACJ;aACJ;YAED,IAAI,CAAC,YAAY,EAAE;AACf,gBAAA,OAAO,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAA,WAAA,CAAa,CAAC,CAAC;gBAC9D,OAAO;aACV;YAED,MAAM,OAAO,GAAGD,aAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;;AAG3C,YAAA,IAAI,WAAmB,CAAC;AACxB,YAAA,IAAI;AACA,gBAAA,WAAW,GAAGC,WAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;aAC1C;YAAC,OAAO,GAAG,EAAE;;gBAEV,WAAW,GAAG,OAAO,CAAC;aACzB;;AAGD,YAAA,MAAM,aAAa,GAAGD,aAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AACvE,YAAA,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,CAACA,aAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACxE,MAAM,UAAU,GAAG,OAAO,GAAG,kBAAkB,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;;AAGtG,YAAA,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;gBAAE,OAAO;YAEhE,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;;YAEzC,MAAM,SAAS,GAAqB,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;YAEtE,IAAI,CAAC,OAAO,EAAE;;AAEV,gBAAA,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;;oBAE7B,SAAS,CAAC,OAAO,GAAG,CAAA,EAAG,UAAU,CAAI,CAAA,EAAA,QAAQ,EAAE,CAAC;;AAEhD,oBAAA,SAAS,CAAC,MAAM,GAAG,CAAA,EAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAI,CAAA,EAAA,QAAQ,EAAE,CAAC;AAC/E,oBAAA,SAAS,CAAC,IAAI,GAAG,CAAA,EAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAI,CAAA,EAAA,QAAQ,EAAE,CAAC;iBAC9E;AAAM,qBAAA,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBACnC,SAAS,CAAC,MAAM,GAAG,CAAA,EAAG,UAAU,CAAI,CAAA,EAAA,QAAQ,EAAE,CAAC;iBAClD;qBAAM;oBACH,SAAS,CAAC,MAAM,GAAG,CAAA,EAAG,UAAU,CAAI,CAAA,EAAA,QAAQ,EAAE,CAAC;iBAClD;aACJ;iBAAM;;gBAEH,IAAI,SAAS,EAAE;AACX,oBAAA,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;;wBAE7B,SAAS,CAAC,OAAO,GAAG,CAAA,EAAG,UAAU,CAAY,SAAA,EAAA,QAAQ,EAAE,CAAC;wBACxD,SAAS,CAAC,MAAM,GAAG,CAAA,EAAG,UAAU,CAAW,QAAA,EAAA,QAAQ,EAAE,CAAC;wBACtD,SAAS,CAAC,IAAI,GAAG,CAAA,EAAG,UAAU,CAAS,MAAA,EAAA,QAAQ,EAAE,CAAC;wBAClD,SAAS,CAAC,MAAM,GAAG,CAAA,EAAG,UAAU,CAAW,QAAA,EAAA,QAAQ,EAAE,CAAC;qBACzD;AAAM,yBAAA,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;wBACnC,SAAS,CAAC,MAAM,GAAG,CAAA,EAAG,UAAU,CAAW,QAAA,EAAA,QAAQ,EAAE,CAAC;qBACzD;AACD,oBAAA,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;iBAC9B;qBAAM;;AAEH,oBAAA,SAAS,CAAC,MAAM,GAAG,CAAG,EAAA,UAAU,MAAM,CAAC;AACvC,oBAAA,SAAS,CAAC,kBAAkB,GAAG,IAAI,CAAC;iBACvC;aACJ;;AAGD,YAAA,IAAI,eAAuB,CAAC;YAC5B,IAAI,OAAO,EAAE;AACT,gBAAA,eAAe,GAAGA,aAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;aACjF;iBAAM;gBACH,eAAe,GAAGA,aAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;aAC3E;AACD,YAAA,IAAIC,WAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;AAChC,gBAAA,IAAI;oBACA,MAAM,UAAU,GAAGA,WAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;oBAC7D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AACnC,oBAAA,IAAI,GAAG,CAAC,IAAI,EAAE;AACV,wBAAA,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA,CAAA,EAAI,QAAQ,CAAA,CAAE,CAAC,CAAC;qBAChE;iBACJ;gBAAC,OAAO,KAAK,EAAE;oBACZ,OAAO,CAAC,KAAK,CAAC,CAAA,+BAAA,EAAkC,UAAU,CAAG,CAAA,CAAA,EAAE,KAAK,CAAC,CAAC;iBACzE;aACJ;AAED,YAAA,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;SAC9D;AACL,KAAC,CAAC,CAAC;;AAGH,IAAA,MAAM,WAAW,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;;AAGvD,IAAA,MAAM,aAAa,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;AACtD,IAAA,OAAO,aAAa,CAAC;AACzB,CAAC;AAED;;;AAGG;AACH,SAAS,kBAAkB,CAAC,OAAc,EAAA;;AAEtC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,MAAM,GAAU,EAAE,CAAC;AAEzB,IAAA,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;QAGvB,IAAI,QAAQ,GAAG,KAAK,CAAC;;AAGrB,QAAA,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;;AAG1B,QAAA,KAAK,MAAM,QAAQ,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE;AAC3E,YAAA,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACf,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE;;AAE9B,oBAAA,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;iBAE3B;qBAAM;;oBAEH,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC7B,QAAQ,GAAG,IAAI,CAAC;iBACnB;aACJ;SACJ;;;QAID,IAAI,QAAQ,EAAE;AACV,YAAA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACvB;KACJ;AAED,IAAA,OAAO,MAAM,CAAC;AAClB"}
|
|
@@ -30,7 +30,7 @@ function renameTemplateFilesSync(dirPath) {
|
|
|
30
30
|
*
|
|
31
31
|
* Provide optional projectPaths to override defaults.
|
|
32
32
|
*/
|
|
33
|
-
function setupCommonPackage(projectPaths = {}) {
|
|
33
|
+
function setupCommonPackage(projectPaths = {}, forceClean = false) {
|
|
34
34
|
// Default template path, if none provided in projectPaths
|
|
35
35
|
const templatePath = projectPaths.templateCommonDir
|
|
36
36
|
? path.resolve(projectPaths.templateCommonDir)
|
|
@@ -42,10 +42,19 @@ function setupCommonPackage(projectPaths = {}) {
|
|
|
42
42
|
console.log('--- Debug Info (setupCommonPackage) ---');
|
|
43
43
|
console.log('templatePath:', templatePath);
|
|
44
44
|
console.log('commonPackagePath:', commonPackagePath);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
if (forceClean) {
|
|
46
|
+
// Only remove everything if force clean is requested
|
|
47
|
+
fs.removeSync(commonPackagePath);
|
|
48
|
+
fs.ensureDirSync(commonPackagePath);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
// Otherwise just ensure the directory exists and clean src
|
|
52
|
+
fs.ensureDirSync(commonPackagePath);
|
|
53
|
+
const srcPath = path.join(commonPackagePath, 'src');
|
|
54
|
+
if (fs.existsSync(srcPath)) {
|
|
55
|
+
fs.removeSync(srcPath);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
49
58
|
// 3) Copy template into it
|
|
50
59
|
if (!fs.existsSync(templatePath)) {
|
|
51
60
|
console.error(`Template path not found: ${templatePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupCommonPackage.cjs","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["fileURLToPath"],"mappings":"mKAUA,MAAM,eAAe,GAAGA,iBAAa,CAAC,sRAAe,CAAC,CAAC;AACvD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAErD;;;;AAIG;AACH,SAAS,sBAAsB,CAAC,QAAgB,EAAA;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;AAEG;AACH,SAAS,uBAAuB,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,IAAA,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;AACzB,QAAA,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;AACjD,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACrB,uBAAuB,CAAC,SAAS,CAAC,CAAC;SACtC;AAAM,aAAA,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AACxE,YAAA,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,YAAA,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SACxD;KACJ;AACL,CAAC;AAED;;;;;AAKG;
|
|
1
|
+
{"version":3,"file":"setupCommonPackage.cjs","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["fileURLToPath"],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ interface ProjectPaths {
|
|
|
8
8
|
*
|
|
9
9
|
* Provide optional projectPaths to override defaults.
|
|
10
10
|
*/
|
|
11
|
-
export declare function setupCommonPackage(projectPaths?: ProjectPaths): void;
|
|
11
|
+
export declare function setupCommonPackage(projectPaths?: ProjectPaths, forceClean?: boolean): void;
|
|
12
12
|
export {};
|
|
@@ -30,7 +30,7 @@ function renameTemplateFilesSync(dirPath) {
|
|
|
30
30
|
*
|
|
31
31
|
* Provide optional projectPaths to override defaults.
|
|
32
32
|
*/
|
|
33
|
-
function setupCommonPackage(projectPaths = {}) {
|
|
33
|
+
function setupCommonPackage(projectPaths = {}, forceClean = false) {
|
|
34
34
|
// Default template path, if none provided in projectPaths
|
|
35
35
|
const templatePath = projectPaths.templateCommonDir
|
|
36
36
|
? path__default.resolve(projectPaths.templateCommonDir)
|
|
@@ -42,10 +42,19 @@ function setupCommonPackage(projectPaths = {}) {
|
|
|
42
42
|
console.log('--- Debug Info (setupCommonPackage) ---');
|
|
43
43
|
console.log('templatePath:', templatePath);
|
|
44
44
|
console.log('commonPackagePath:', commonPackagePath);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
if (forceClean) {
|
|
46
|
+
// Only remove everything if force clean is requested
|
|
47
|
+
fs.removeSync(commonPackagePath);
|
|
48
|
+
fs.ensureDirSync(commonPackagePath);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
// Otherwise just ensure the directory exists and clean src
|
|
52
|
+
fs.ensureDirSync(commonPackagePath);
|
|
53
|
+
const srcPath = path__default.join(commonPackagePath, 'src');
|
|
54
|
+
if (fs.existsSync(srcPath)) {
|
|
55
|
+
fs.removeSync(srcPath);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
49
58
|
// 3) Copy template into it
|
|
50
59
|
if (!fs.existsSync(templatePath)) {
|
|
51
60
|
console.error(`Template path not found: ${templatePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupCommonPackage.js","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["path"],"mappings":"yFAUA,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvD,MAAM,cAAc,GAAGA,aAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAErD;;;;AAIG;AACH,SAAS,sBAAsB,CAAC,QAAgB,EAAA;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;AAEG;AACH,SAAS,uBAAuB,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,IAAA,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;AACzB,QAAA,MAAM,SAAS,GAAGA,aAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;AACjD,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACrB,uBAAuB,CAAC,SAAS,CAAC,CAAC;SACtC;AAAM,aAAA,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AACxE,YAAA,MAAM,OAAO,GAAGA,aAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,YAAA,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SACxD;KACJ;AACL,CAAC;AAED;;;;;AAKG;
|
|
1
|
+
{"version":3,"file":"setupCommonPackage.js","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["path"],"mappings":"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"}
|
|
@@ -16,12 +16,14 @@
|
|
|
16
16
|
"./lib/generated/generated-models.js": "./lib/generated/generated-models.js",
|
|
17
17
|
"./lib/generated/introspection-result.js": "./lib/generated/introspection-result.js",
|
|
18
18
|
"./lib/generated/generated.js": "./lib/generated/generated.js",
|
|
19
|
+
"./lib/generated/service-schemas.js": "./lib/generated/service-schemas.js",
|
|
19
20
|
"./lib/index.js": "./lib/index.js"
|
|
20
21
|
},
|
|
21
22
|
"scripts": {
|
|
22
23
|
"build": "npm run build:clean && npm run build:lib",
|
|
23
24
|
"build:clean": "rimraf lib",
|
|
24
25
|
"build:lib": "rollup -c rollup.config.mjs",
|
|
26
|
+
"build:fix": "node ./scripts/fix-generated-types.js",
|
|
25
27
|
"build:lib:watch": "npm run build:lib -- -w",
|
|
26
28
|
"watch": "npm run build:lib:watch"
|
|
27
29
|
},
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Post-build script to fix malformed generated TypeScript definitions
|
|
5
|
+
* Fixes issues where JSDoc comments are incorrectly inserted into type definitions
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import { readFileSync, writeFileSync } from 'fs';
|
|
9
|
+
import { fileURLToPath } from 'url';
|
|
10
|
+
import { dirname, join } from 'path';
|
|
11
|
+
|
|
12
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
13
|
+
const __dirname = dirname(__filename);
|
|
14
|
+
|
|
15
|
+
const generatedFilePath = join(__dirname, '../lib/generated/generated.d.ts');
|
|
16
|
+
|
|
17
|
+
try {
|
|
18
|
+
console.log('Fixing generated type definitions...');
|
|
19
|
+
|
|
20
|
+
let content = readFileSync(generatedFilePath, 'utf8');
|
|
21
|
+
|
|
22
|
+
// Fix issue where JSDoc comments are inserted in the middle of type definitions
|
|
23
|
+
// Pattern 1: SchemaTypes.Scalars["URI"] /**...*/ ["input"]
|
|
24
|
+
// Should be: SchemaTypes.Scalars["URI"]["input"]
|
|
25
|
+
const jsdocInTypeRegex = /SchemaTypes\.Scalars\["URI"\]\s*\/\*\*[\s\S]*?\*\/\s*\["input"\]/g;
|
|
26
|
+
content = content.replace(jsdocInTypeRegex, 'SchemaTypes.Scalars["URI"]["input"]');
|
|
27
|
+
|
|
28
|
+
// Pattern 2: SchemaTypes.Scalars["Int"] /**...*/ ["input"]
|
|
29
|
+
// Remove JSDoc comments that appear between type accessors
|
|
30
|
+
const jsdocBetweenAccessorsRegex = /(SchemaTypes\.Scalars\["[^"]+"\])\s*\/\*\*[\s\S]*?\*\/\s*(\["input"\])/g;
|
|
31
|
+
content = content.replace(jsdocBetweenAccessorsRegex, '$1$2');
|
|
32
|
+
|
|
33
|
+
// Pattern 3: Fix closing JSDoc that appears as a standalone line followed by ["input"]
|
|
34
|
+
// Pattern: */ ["input"]>
|
|
35
|
+
// Should be removed - the JSDoc block shouldn't be there at all
|
|
36
|
+
const standaloneJsdocCloseRegex = /\s*\*\/\["input"\]>/g;
|
|
37
|
+
content = content.replace(standaloneJsdocCloseRegex, '>');
|
|
38
|
+
|
|
39
|
+
// Pattern 4: Fix multi-line JSDoc comments that break type definitions
|
|
40
|
+
// This happens when a JSDoc comment from another function is incorrectly placed
|
|
41
|
+
// between type accessor parts, e.g., ["String"] /**...*/ ["input"]
|
|
42
|
+
// Match any Scalar type followed by JSDoc followed by ["input"] or ["output"]
|
|
43
|
+
const multilineJsdocInTypeRegex = /(SchemaTypes\.Scalars\[[^\]]+\])\s*\/\*\*[\s\S]*?\*\/\s*(\["(?:input|output)"\])/g;
|
|
44
|
+
content = content.replace(multilineJsdocInTypeRegex, '$1$2');
|
|
45
|
+
|
|
46
|
+
// Pattern 5: Fix cases where JSDoc appears between other type accessors
|
|
47
|
+
// e.g., key: SchemaTypes.Scalars["String"] /**...*/ ["input"];
|
|
48
|
+
const typeAccessorJsdocRegex = /(\w+:\s*SchemaTypes\.\w+\[[^\]]+\])\s*\/\*\*[\s\S]*?\*\/\s*(\[[^\]]+\])/g;
|
|
49
|
+
content = content.replace(typeAccessorJsdocRegex, '$1$2');
|
|
50
|
+
|
|
51
|
+
// Write the fixed content back
|
|
52
|
+
writeFileSync(generatedFilePath, content, 'utf8');
|
|
53
|
+
|
|
54
|
+
console.log('✓ Successfully fixed generated type definitions');
|
|
55
|
+
} catch (error) {
|
|
56
|
+
console.error('Error fixing generated types:', error.message);
|
|
57
|
+
process.exit(1);
|
|
58
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
//@ts-nocheck
|
|
2
|
+
import { DataProxy } from '@apollo/client/cache';
|
|
3
|
+
import { ApolloClient } from '@apollo/client/index.js';
|
|
4
|
+
import { CdmLogger } from '@cdm-logger/core';
|
|
5
|
+
import express from 'express';
|
|
6
|
+
import { IPreferncesTransformed } from '@common-stack/server-core';
|
|
7
|
+
import { ClientContext } from './client-context';
|
|
8
|
+
import { IHttpReq, IIGraphQlContext } from './generated/generated-models';
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
*
|
|
12
|
+
* Context
|
|
13
|
+
* @export
|
|
14
|
+
* @interface MyContext
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
export interface IDataSources {}
|
|
18
|
+
|
|
19
|
+
export interface IHttpMiddlewareContext {
|
|
20
|
+
req?: express.Request &
|
|
21
|
+
IHttpReq & {
|
|
22
|
+
logger?: CdmLogger.ILogger;
|
|
23
|
+
errors?: any;
|
|
24
|
+
};
|
|
25
|
+
res: express.Response;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export interface IGraphQLContext extends IIGraphQlContext {}
|
|
29
|
+
export interface ServerContext extends IHttpMiddlewareContext, IGraphQLContext {
|
|
30
|
+
/** Backend Datasource */
|
|
31
|
+
dataSources: IDataSources;
|
|
32
|
+
preferences: IPreferncesTransformed[];
|
|
33
|
+
}
|
|
34
|
+
export interface MyContext extends ClientContext, ServerContext {}
|
|
@@ -4,7 +4,16 @@ import { ApolloClient } from '@apollo/client/index.js';
|
|
|
4
4
|
import { CdmLogger } from '@cdm-logger/core';
|
|
5
5
|
import express from 'express';
|
|
6
6
|
import { IPreferncesTransformed } from '@common-stack/server-core';
|
|
7
|
-
import {
|
|
7
|
+
import { ClientContext } from './client-context';
|
|
8
|
+
import {
|
|
9
|
+
IUserContext,
|
|
10
|
+
IUserProfile,
|
|
11
|
+
IIAuth0Token,
|
|
12
|
+
AuthStrategy,
|
|
13
|
+
ICdecodeParsedUri,
|
|
14
|
+
IHttpReq,
|
|
15
|
+
IIGraphQlContext,
|
|
16
|
+
} from './generated/generated-models';
|
|
8
17
|
/**
|
|
9
18
|
*
|
|
10
19
|
* Context
|
|
@@ -12,22 +21,6 @@ import { IUserContext, IUserProfile, IIAuth0Token, AuthStrategy } from './genera
|
|
|
12
21
|
* @interface MyContext
|
|
13
22
|
*/
|
|
14
23
|
|
|
15
|
-
export interface ClientContext {
|
|
16
|
-
/**
|
|
17
|
-
* Only application on the client side
|
|
18
|
-
*/
|
|
19
|
-
cache: DataProxy;
|
|
20
|
-
/**
|
|
21
|
-
* Only application on the client side
|
|
22
|
-
*/
|
|
23
|
-
getCacheKey: (options: { __typename: string; id?: string }) => string;
|
|
24
|
-
/**
|
|
25
|
-
* Only applicable on the client side
|
|
26
|
-
*/
|
|
27
|
-
apolloClient: ApolloClient<any>; // deprecated use `client` instead
|
|
28
|
-
client: ApolloClient<any>;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
24
|
export interface IDataSources {}
|
|
32
25
|
|
|
33
26
|
export interface IHttpMiddlewareContext {
|
|
@@ -36,21 +29,21 @@ export interface IHttpMiddlewareContext {
|
|
|
36
29
|
permissions?: any;
|
|
37
30
|
cdecodeuri?: any;
|
|
38
31
|
logger?: CdmLogger.ILogger;
|
|
32
|
+
currentPageUriSegments?: ICdecodeParsedUri;
|
|
39
33
|
user?: IIAuth0Token;
|
|
40
34
|
errors?: any;
|
|
41
35
|
profile?: IUserProfile;
|
|
42
|
-
};
|
|
36
|
+
} & IHttpReq;
|
|
43
37
|
res: express.Response;
|
|
44
38
|
}
|
|
45
39
|
|
|
46
|
-
export
|
|
40
|
+
export interface IGraphQLContext extends IIGraphQlContext {
|
|
47
41
|
/**
|
|
48
42
|
* current ip of the user fetched from the request
|
|
49
43
|
*/
|
|
50
44
|
userIp: string;
|
|
51
45
|
};
|
|
52
46
|
export interface ServerContext extends IHttpMiddlewareContext, IGraphQLContext {
|
|
53
|
-
accessRoleService: any;
|
|
54
47
|
user?: IIAuth0Token;
|
|
55
48
|
userContext?: IUserContext;
|
|
56
49
|
orgname?: string;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
|
|
2
|
+
import { DataProxy } from '@apollo/client/cache';
|
|
3
|
+
import { ApolloClient } from '@apollo/client/index.js';
|
|
4
|
+
|
|
5
|
+
export interface ClientContext {
|
|
6
|
+
/**
|
|
7
|
+
* Only application on the client side
|
|
8
|
+
*/
|
|
9
|
+
cache: DataProxy;
|
|
10
|
+
/**
|
|
11
|
+
* Only application on the client side
|
|
12
|
+
*/
|
|
13
|
+
getCacheKey: (options: { __typename: string; id?: string }) => string;
|
|
14
|
+
/**
|
|
15
|
+
* Only applicable on the client side
|
|
16
|
+
*/
|
|
17
|
+
apolloClient: ApolloClient<any>; // deprecated use `client` instead
|
|
18
|
+
client: ApolloClient<any>;
|
|
19
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
/* tslint:disable */
|
|
2
|
+
import { Event, Emitter } from './event';
|
|
3
|
+
|
|
4
|
+
export interface Disposable {
|
|
5
|
+
/**
|
|
6
|
+
* Dispose this object.
|
|
7
|
+
*/
|
|
8
|
+
dispose(): void;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export namespace Disposable {
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
|
+
export function is(arg: any): arg is Disposable {
|
|
14
|
+
return !!arg && typeof arg === 'object' && 'dispose' in arg && typeof arg['dispose'] === 'function';
|
|
15
|
+
}
|
|
16
|
+
export function create(func: () => void): Disposable {
|
|
17
|
+
return {
|
|
18
|
+
dispose: func
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export const NULL = create(() => { });
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export class DisposableCollection implements Disposable {
|
|
25
|
+
|
|
26
|
+
protected readonly disposables: Disposable[] = [];
|
|
27
|
+
protected readonly onDisposeEmitter = new Emitter<void>();
|
|
28
|
+
|
|
29
|
+
constructor(...toDispose: Disposable[]) {
|
|
30
|
+
toDispose.forEach(d => this.push(d));
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* This event is fired only once
|
|
35
|
+
* on first dispose of not empty collection.
|
|
36
|
+
*/
|
|
37
|
+
get onDispose(): Event<void> {
|
|
38
|
+
return this.onDisposeEmitter.event;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
protected checkDisposed(): void {
|
|
42
|
+
if (this.disposed && !this.disposingElements) {
|
|
43
|
+
this.onDisposeEmitter.fire(undefined);
|
|
44
|
+
this.onDisposeEmitter.dispose();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
get disposed(): boolean {
|
|
49
|
+
return this.disposables.length === 0;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
private disposingElements = false;
|
|
53
|
+
dispose(): void {
|
|
54
|
+
if (this.disposed || this.disposingElements) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
this.disposingElements = true;
|
|
58
|
+
while (!this.disposed) {
|
|
59
|
+
try {
|
|
60
|
+
this.disposables.pop()!.dispose();
|
|
61
|
+
} catch (e) {
|
|
62
|
+
console.error(e);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
this.disposingElements = false;
|
|
66
|
+
this.checkDisposed();
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
push(disposable: Disposable): Disposable {
|
|
70
|
+
const disposables = this.disposables;
|
|
71
|
+
disposables.push(disposable);
|
|
72
|
+
const originalDispose = disposable.dispose.bind(disposable);
|
|
73
|
+
const toRemove = Disposable.create(() => {
|
|
74
|
+
const index = disposables.indexOf(disposable);
|
|
75
|
+
if (index !== -1) {
|
|
76
|
+
disposables.splice(index, 1);
|
|
77
|
+
}
|
|
78
|
+
this.checkDisposed();
|
|
79
|
+
});
|
|
80
|
+
disposable.dispose = () => {
|
|
81
|
+
toRemove.dispose();
|
|
82
|
+
originalDispose();
|
|
83
|
+
};
|
|
84
|
+
return toRemove;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
pushAll(disposables: Disposable[]): Disposable[] {
|
|
88
|
+
return disposables.map(disposable =>
|
|
89
|
+
this.push(disposable)
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
// import { expect } from 'vitest';
|
|
2
|
+
// import { Emitter } from './event';
|
|
3
|
+
|
|
4
|
+
// describe('Event Objects', () => {
|
|
5
|
+
|
|
6
|
+
// it('Emitter firing should be synchronous', () => {
|
|
7
|
+
// const emitter = new Emitter<undefined>();
|
|
8
|
+
// let counter = 0;
|
|
9
|
+
|
|
10
|
+
// emitter.event(() => counter++);
|
|
11
|
+
// expect(counter).eq(0);
|
|
12
|
+
// emitter.fire(undefined);
|
|
13
|
+
// expect(counter).eq(1);
|
|
14
|
+
// });
|
|
15
|
+
|
|
16
|
+
// });
|