@softarc/native-federation 3.5.5 → 4.0.0-RC10

package/src/lib/utils/rebuild-queue.js

@@ -1,48 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RebuildQueue = void 0;
-const logger_1 = require("./logger");
-class RebuildQueue {
+import { logger } from './logger.js';
+export class RebuildQueue {
     activeBuilds = new Map();
     buildCounter = 0;
-    async enqueue(rebuildFn) {
+    async track(rebuildFn, interruptPromise) {
         const buildId = ++this.buildCounter;
-        const pendingCancellations = Array.from(this.activeBuilds.values()).map((buildInfo) => {
-            buildInfo.controller.abort();
-            return buildInfo.buildFinished.promise;
+        const pendingCancellations = Array.from(this.activeBuilds.values()).map(buildControl => {
+            buildControl.controller.abort();
+            return buildControl.buildFinished.promise;
         });
         if (pendingCancellations.length > 0) {
-            logger_1.logger.info(`Aborting ${pendingCancellations.length} bundling task(s)..`);
-        }
-        if (pendingCancellations.length > 0) {
+            logger.info(`Aborting ${pendingCancellations.length} bundling task(s)..`);
             await Promise.all(pendingCancellations);
         }
-        let buildFinished;
-        const completionPromise = new Promise((resolve) => {
-            buildFinished = resolve;
+        let resolveCompletion;
+        const completionPromise = new Promise(resolve => {
+            resolveCompletion = resolve;
         });
         const control = {
             controller: new AbortController(),
             buildFinished: {
-                resolve: buildFinished,
+                resolve: resolveCompletion,
                 promise: completionPromise,
             },
         };
         this.activeBuilds.set(buildId, control);
+        const buildPromise = rebuildFn(control.controller.signal)
+            .then(result => ({ type: 'completed', result }))
+            .catch(error => ({ type: 'completed', result: { success: false, error } }));
+        let trackResult;
         try {
-            await rebuildFn(control.controller.signal);
+            if (interruptPromise) {
+                const interruptResult = interruptPromise.then(value => ({
+                    type: 'interrupted',
+                    value,
+                }));
+                const raceResult = await Promise.race([buildPromise, interruptResult]);
+                if (raceResult.type === 'interrupted') {
+                    control.controller.abort();
+                    await buildPromise;
+                    trackResult = raceResult;
+                }
+                else {
+                    trackResult = raceResult;
+                }
+            }
+            else {
+                trackResult = await buildPromise;
+            }
         }
         finally {
             control.buildFinished.resolve();
             this.activeBuilds.delete(buildId);
         }
+        return trackResult;
     }
     dispose() {
-        for (const [_, buildInfo] of this.activeBuilds) {
-            buildInfo.controller.abort();
+        for (const buildControl of this.activeBuilds.values()) {
+            buildControl.controller.abort();
         }
         this.activeBuilds.clear();
     }
 }
-exports.RebuildQueue = RebuildQueue;
-//# sourceMappingURL=rebuild-queue.js.map

package/src/lib/utils/resolve-glob.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveGlobSync = resolveGlobSync;
-const tslib_1 = require("tslib");
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-function resolveGlobSync(pattern, baseDir = process.cwd()) {
+import * as fs from 'fs';
+import * as path from 'path';
+export function resolveGlobSync(pattern, baseDir = process.cwd()) {
     if (pattern.startsWith('./')) {
         pattern = pattern.substring(2);
     }
@@ -19,16 +15,15 @@ function resolveGlobSync(pattern, baseDir = process.cwd()) {
         const entries = fs.readdirSync(dir, { withFileTypes: true });
         if (segment === '*') {
             entries
-                .filter((entry) => entry.isDirectory())
-                .forEach((entry) => search(path.join(dir, entry.name), segmentIndex + 1));
+                .filter(entry => entry.isDirectory())
+                .forEach(entry => search(path.join(dir, entry.name), segmentIndex + 1));
         }
         else {
             entries
-                .filter((entry) => entry.name === segment)
-                .forEach((entry) => search(path.join(dir, entry.name), segmentIndex + 1));
+                .filter(entry => entry.name === segment)
+                .forEach(entry => search(path.join(dir, entry.name), segmentIndex + 1));
         }
     }
     search(baseDir, 0);
     return results;
 }
-//# sourceMappingURL=resolve-glob.js.map

package/src/lib/utils/resolve-wildcard-keys.js

@@ -1,12 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveTsConfigWildcard = resolveTsConfigWildcard;
-exports.resolvePackageJsonExportsWildcard = resolvePackageJsonExportsWildcard;
-const tslib_1 = require("tslib");
-const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-const logger_1 = require("./logger");
+import fg from 'fast-glob';
+import * as fs from 'fs';
+import * as path from 'path';
+import { logger } from './logger.js';
 // TypeScript's module resolution for directories checks these in order
 // @see https://www.typescriptlang.org/docs/handbook/modules/theory.html#module-resolution
 const TS_INDEX_FILES = [
@@ -33,7 +28,7 @@ const TS_INDEX_FILES = [
  *
 // @see https://www.typescriptlang.org/docs/handbook/modules/theory.html#module-resolution
  */
-function resolveTsConfigWildcard(keyPattern, valuePattern, cwd) {
+export function resolveTsConfigWildcard(keyPattern, valuePattern, cwd) {
     const normalizedPattern = valuePattern.replace(/^\.?\/+/, '');
     const asteriskIndex = normalizedPattern.indexOf('*');
     if (asteriskIndex === -1) {
@@ -74,9 +69,9 @@ function resolveTsConfigWildcard(keyPattern, valuePattern, cwd) {
         }
         const key = keyPattern.replace('*', entry);
         if (fullPathStats.isDirectory()) {
-            const indexFile = TS_INDEX_FILES.find((indexFile) => fs.existsSync(path.join(fullPath, indexFile)));
+            const indexFile = TS_INDEX_FILES.find(indexFile => fs.existsSync(path.join(fullPath, indexFile)));
             if (!indexFile) {
-                logger_1.logger.warn(`[shared-mappings] Internal lib '${key}' does not contain an entryPoint (barrel file).`);
+                logger.warn(`[shared-mappings] Internal lib '${key}' does not contain an entryPoint (barrel file).`);
                 continue;
             }
             modulePath = path.join(modulePath, indexFile);
@@ -101,7 +96,7 @@ function resolveTsConfigWildcard(keyPattern, valuePattern, cwd) {
  *
  * @see https://nodejs.org/api/packages.html#subpath-patterns
  */
-function resolvePackageJsonExportsWildcard(keyPattern, valuePattern, cwd) {
+export function resolvePackageJsonExportsWildcard(keyPattern, valuePattern, cwd) {
     const normalizedPattern = valuePattern.replace(/^\.?\/+/, '');
     const asteriskIndex = normalizedPattern.indexOf('*');
     if (asteriskIndex === -1) {
@@ -110,7 +105,7 @@ function resolvePackageJsonExportsWildcard(keyPattern, valuePattern, cwd) {
     const prefix = normalizedPattern.substring(0, asteriskIndex);
     const suffix = normalizedPattern.substring(asteriskIndex + 1);
     // fast-glob requires **/* pattern for matching files at any depth
-    const files = fast_glob_1.default.sync(prefix + '**/*' + suffix, {
+    const files = fg.sync(prefix + '**/*' + suffix, {
         cwd,
         onlyFiles: true,
         deep: Infinity,
@@ -129,4 +124,3 @@ function resolvePackageJsonExportsWildcard(keyPattern, valuePattern, cwd) {
     }
     return keys;
 }
-//# sourceMappingURL=resolve-wildcard-keys.js.map

package/src/lib/utils/rewrite-chunk-imports.d.ts

@@ -1,4 +1,2 @@
-export declare const INTERNAL_SCOPE = "@nf-internal";
 export declare function rewriteChunkImports(filePath: string): void;
 export declare function isSourceFile(fileName: string): boolean;
-export declare function deriveInternalName(fileName: string): string;

package/src/lib/utils/rewrite-chunk-imports.js

@@ -1,15 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.INTERNAL_SCOPE = void 0;
-exports.rewriteChunkImports = rewriteChunkImports;
-exports.isSourceFile = isSourceFile;
-exports.deriveInternalName = deriveInternalName;
-const tslib_1 = require("tslib");
-const ts = tslib_1.__importStar(require("typescript"));
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-exports.INTERNAL_SCOPE = '@nf-internal';
-function rewriteChunkImports(filePath) {
+import * as ts from 'typescript';
+import * as fs from 'fs';
+import * as path from 'path';
+import { toChunkImport } from '../domain/core/chunk.js';
+export function rewriteChunkImports(filePath) {
     const sourceCode = fs.readFileSync(filePath, 'utf-8');
     const sourceFile = ts.createSourceFile(path.basename(filePath), sourceCode, ts.ScriptTarget.ESNext, true, ts.ScriptKind.JS);
     const printer = ts.createPrinter();
@@ -20,7 +13,7 @@ function rewriteChunkImports(filePath) {
             if (moduleSpecifier && ts.isStringLiteral(moduleSpecifier)) {
                 const text = moduleSpecifier.text;
                 if (text.startsWith('./')) {
-                    const newModuleSpecifier = ts.factory.createStringLiteral(deriveInternalName(text));
+                    const newModuleSpecifier = ts.factory.createStringLiteral(toChunkImport(text));
                     if (ts.isImportDeclaration(node)) {
                         return ts.factory.updateImportDeclaration(node, node.modifiers, node.importClause, newModuleSpecifier, node.assertClause);
                     }
@@ -31,34 +24,25 @@ function rewriteChunkImports(filePath) {
             }
         }
         // import('./...')
-        if (ts.isCallExpression(node) &&
-            node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+        if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword) {
             const [arg] = node.arguments;
             if (arg && ts.isStringLiteral(arg)) {
                 const text = arg.text;
                 if (text.startsWith('./')) {
-                    const newArg = ts.factory.createStringLiteral(deriveInternalName(text));
-                    return ts.factory.updateCallExpression(node, node.expression, node.typeArguments, [newArg]);
+                    const newArg = ts.factory.createStringLiteral(toChunkImport(text));
+                    return ts.factory.updateCallExpression(node, node.expression, node.typeArguments, [
+                        newArg,
+                    ]);
                 }
             }
         }
         return ts.visitEachChild(node, visit, undefined);
     }
-    const transformed = ts.transform(sourceFile, [
-        (context) => (node) => ts.visitNode(node, visit),
-    ]);
+    const transformed = ts.transform(sourceFile, [_ => node => ts.visitNode(node, visit)]);
     const updatedSourceFile = transformed.transformed[0];
     const result = printer.printFile(updatedSourceFile);
     fs.writeFileSync(filePath, result, 'utf-8');
 }
-function isSourceFile(fileName) {
+export function isSourceFile(fileName) {
     return !!fileName.match(/.(m|c)?js$/);
 }
-function deriveInternalName(fileName) {
-    if (fileName.startsWith('./')) {
-        fileName = fileName.slice(2);
-    }
-    const packageName = fileName.replace(/.(m|c)?js$/, '');
-    return exports.INTERNAL_SCOPE + '/' + packageName;
-}
-//# sourceMappingURL=rewrite-chunk-imports.js.map

package/LICENSE

@@ -1,8 +0,0 @@
-Copyright 2021 Softarc Consulting GmbH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-