packtory 0.0.22 → 0.0.24

package/config/root-config-validation.js

@@ -1,5 +1,6 @@
 function createExplicitValidationState() {
     return {
+        issues: [],
         usedRootIds: new Set(),
         publicRootIds: new Set(),
         seenExportKeys: new Set(),
@@ -7,6 +8,71 @@ function createExplicitValidationState() {
         seenPrivateRootIds: new Set()
     };
 }
+function pushUnknownRootIssue(packageConfig, state, referenceName, rootId) {
+    if (packageConfig.roots[rootId] === undefined) {
+        state.issues.push(`Package "${packageConfig.name}" ${referenceName} references unknown root "${rootId}"`);
+    }
+}
+function pushDuplicateIssue(state, seenValues, value, message) {
+    if (seenValues.has(value)) {
+        state.issues.push(message);
+    }
+}
+function validateExplicitRootEntries(packageConfig, state, validation) {
+    for (const entry of validation.entries) {
+        const entryName = validation.entryNameFor(entry);
+        pushUnknownRootIssue(packageConfig, state, `${validation.referenceLabel} "${entryName}"`, entry.root);
+        pushDuplicateIssue(state, validation.seenValues, entryName, `Package "${packageConfig.name}" declares duplicate ${validation.duplicateLabel} "${entryName}"`);
+        validation.seenValues.add(entryName);
+        state.usedRootIds.add(entry.root);
+        state.publicRootIds.add(entry.root);
+    }
+}
+function validateExplicitPublicEntries(packageConfig, state) {
+    validateExplicitRootEntries(packageConfig, state, {
+        duplicateLabel: 'export key',
+        entries: packageConfig.packageInterface.modules ?? [],
+        entryNameFor(entry) {
+            return entry.export;
+        },
+        referenceLabel: 'module export',
+        seenValues: state.seenExportKeys
+    });
+    validateExplicitRootEntries(packageConfig, state, {
+        duplicateLabel: 'bin name',
+        entries: packageConfig.packageInterface.bins ?? [],
+        entryNameFor(entry) {
+            return entry.name;
+        },
+        referenceLabel: 'bin',
+        seenValues: state.seenBinNames
+    });
+}
+function validateExplicitPrivateRoots(packageConfig, state) {
+    for (const rootId of packageConfig.packageInterface.privateRoots ?? []) {
+        pushUnknownRootIssue(packageConfig, state, `private root "${rootId}"`, rootId);
+        pushDuplicateIssue(state, state.seenPrivateRootIds, rootId, `Package "${packageConfig.name}" declares duplicate private root "${rootId}"`);
+        if (state.publicRootIds.has(rootId)) {
+            state.issues.push(`Package "${packageConfig.name}" root "${rootId}" cannot be both public and private`);
+        }
+        state.seenPrivateRootIds.add(rootId);
+        state.usedRootIds.add(rootId);
+    }
+}
+function pushExplicitUnusedRootIssues(packageConfig, state) {
+    for (const rootId of Object.keys(packageConfig.roots)) {
+        if (!state.usedRootIds.has(rootId)) {
+            state.issues.push(`Package "${packageConfig.name}" defines unused root "${rootId}" in explicit mode`);
+        }
+    }
+}
+function validateExplicitRootConfiguration(packageConfig) {
+    const state = createExplicitValidationState();
+    validateExplicitPublicEntries(packageConfig, state);
+    validateExplicitPrivateRoots(packageConfig, state);
+    pushExplicitUnusedRootIssues(packageConfig, state);
+    return state.issues;
+}
 function validateDuplicateRootJavaScriptTargets(packageConfig) {
     const issues = [];
     const jsPaths = new Map();
@@ -22,10 +88,9 @@ function validateDuplicateRootJavaScriptTargets(packageConfig) {
     return issues;
 }
 function validateImplicitRootConfiguration(packageConfig) {
-    const rootIds = Object.keys(packageConfig.roots);
-    const issues = [];
     const { defaultModuleRoot } = packageConfig;
-    if (rootIds.length > 1 && defaultModuleRoot === undefined) {
+    const issues = [];
+    if (Object.keys(packageConfig.roots).length > 1 && defaultModuleRoot === undefined) {
         issues.push(`Package "${packageConfig.name}" must define defaultModuleRoot when multiple roots exist`);
     }
     if (defaultModuleRoot !== undefined && packageConfig.roots[defaultModuleRoot] === undefined) {
@@ -33,94 +98,34 @@ function validateImplicitRootConfiguration(packageConfig) {
     }
     return issues;
 }
-function validateExplicitModules(packageConfig, state) {
-    const issues = [];
-    for (const entry of packageConfig.packageInterface.modules ?? []) {
-        if (packageConfig.roots[entry.root] === undefined) {
-            issues.push([
-                `Package "${packageConfig.name}" module export "${entry.export}"`,
-                `references unknown root "${entry.root}"`
-            ].join(' '));
-        }
-        if (state.seenExportKeys.has(entry.export)) {
-            issues.push(`Package "${packageConfig.name}" declares duplicate export key "${entry.export}"`);
-        }
-        state.seenExportKeys.add(entry.export);
-        state.usedRootIds.add(entry.root);
-        state.publicRootIds.add(entry.root);
-    }
-    return issues;
+function hasInvalidExplicitDefaultModuleRoot(packageConfig) {
+    const packageRecord = packageConfig;
+    const { defaultModuleRoot } = packageRecord;
+    return typeof defaultModuleRoot === 'string';
 }
-function validateExplicitBins(packageConfig, state) {
-    const issues = [];
-    for (const entry of packageConfig.packageInterface.bins ?? []) {
-        if (packageConfig.roots[entry.root] === undefined) {
-            issues.push(`Package "${packageConfig.name}" bin "${entry.name}" references unknown root "${entry.root}"`);
-        }
-        if (state.seenBinNames.has(entry.name)) {
-            issues.push(`Package "${packageConfig.name}" declares duplicate bin name "${entry.name}"`);
-        }
-        state.seenBinNames.add(entry.name);
-        state.usedRootIds.add(entry.root);
-        state.publicRootIds.add(entry.root);
+function validateExplicitModeConfiguration(packageConfig) {
+    const issues = validateExplicitRootConfiguration(packageConfig);
+    if (hasInvalidExplicitDefaultModuleRoot(packageConfig)) {
+        const message = [
+            `Package "${packageConfig.name}" cannot combine defaultModuleRoot with packageInterface;`,
+            'remove defaultModuleRoot in explicit mode'
+        ].join(' ');
+        return [message, ...issues];
     }
     return issues;
 }
-function validateExplicitPrivateRoots(packageConfig, state) {
-    return (packageConfig.packageInterface.privateRoots ?? []).flatMap((rootId) => {
-        const issues = [];
-        if (packageConfig.roots[rootId] === undefined) {
-            issues.push(`Package "${packageConfig.name}" private root "${rootId}" references unknown root "${rootId}"`);
-        }
-        if (state.seenPrivateRootIds.has(rootId)) {
-            issues.push(`Package "${packageConfig.name}" declares duplicate private root "${rootId}"`);
-        }
-        if (state.publicRootIds.has(rootId)) {
-            issues.push(`Package "${packageConfig.name}" root "${rootId}" cannot be both public and private`);
-        }
-        state.seenPrivateRootIds.add(rootId);
-        state.usedRootIds.add(rootId);
-        return issues;
-    });
-}
-function validateExplicitUnusedRoots(packageConfig, state) {
-    return Object.keys(packageConfig.roots).flatMap((rootId) => {
-        if (state.usedRootIds.has(rootId)) {
-            return [];
-        }
-        return [`Package "${packageConfig.name}" defines unused root "${rootId}" in explicit mode`];
-    });
-}
-function validateExplicitRootConfiguration(packageConfig) {
-    const state = createExplicitValidationState();
-    return [
-        ...validateExplicitModules(packageConfig, state),
-        ...validateExplicitBins(packageConfig, state),
-        ...validateExplicitPrivateRoots(packageConfig, state),
-        ...validateExplicitUnusedRoots(packageConfig, state)
-    ];
-}
-function buildMutualExclusionIssues(packageName, defaultModuleRoot) {
-    if (defaultModuleRoot === undefined) {
-        return [];
-    }
-    return [
-        [
-            `Package "${packageName}" cannot combine defaultModuleRoot with packageInterface;`,
-            'remove defaultModuleRoot in explicit mode'
-        ].join(' ')
-    ];
-}
 function validateRootConfiguration(packageConfig) {
     const duplicateRootIssues = validateDuplicateRootJavaScriptTargets(packageConfig);
     if (packageConfig.packageInterface === undefined) {
         return [...duplicateRootIssues, ...validateImplicitRootConfiguration(packageConfig)];
     }
-    const packageConfigWithBothFields = packageConfig;
-    const mutualExclusionIssues = buildMutualExclusionIssues(packageConfig.name, packageConfigWithBothFields.defaultModuleRoot);
-    return [...duplicateRootIssues, ...mutualExclusionIssues, ...validateExplicitRootConfiguration(packageConfig)];
+    return [...duplicateRootIssues, ...validateExplicitModeConfiguration(packageConfig)];
 }
 export function validatePackageSurfaceRules(packageConfigs) {
-    return Object.values(packageConfigs).flatMap(validateRootConfiguration);
+    const issues = [];
+    for (const packageConfig of Object.values(packageConfigs)) {
+        issues.push(...validateRootConfiguration(packageConfig));
+    }
+    return issues;
 }
 //# sourceMappingURL=root-config-validation.js.map

package/config/root-config-validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-config-validation.js","sourceRoot":"","sources":["../../../../source/config/root-config-validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"root-config-validation.js","sourceRoot":"","sources":["../../../../source/config/root-config-validation.ts"],"names":[],"mappings":"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"}

package/dead-code-eliminator/cross-bundle/bundle-index.js

@@ -17,9 +17,6 @@ function tryResolveAgainstBundle(indexedBundle, specifier) {
     return { bundleName: indexedBundle.bundle.name, sourceFilePath, indexedBundle };
 }
 export function resolveCrossBundleTarget(specifier, indexed) {
-    if (specifier === undefined) {
-        return undefined;
-    }
     for (const info of indexed.values()) {
         const resolved = tryResolveAgainstBundle(info, specifier);
         if (resolved !== undefined) {

package/dead-code-eliminator/cross-bundle/bundle-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-index.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/cross-bundle/bundle-index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;AAc/F,MAAM,UAAU,YAAY,CACxB,MAAoG;IAEpG,MAAM,GAAG,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC7C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAC9B,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC,CAAC,CACL,CAAC;QACF,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAAC,aAA4B,EAAE,SAAiB;IAC5E,MAAM,cAAc,GAAG,iCAAiC,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC1F,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,SAA6B,EAC7B,OAA2C;IAE3C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"bundle-index.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/cross-bundle/bundle-index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;AAc/F,MAAM,UAAU,YAAY,CACxB,MAAoG;IAEpG,MAAM,GAAG,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC7C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAC9B,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC,CAAC,CACL,CAAC;QACF,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAAC,aAA4B,EAAE,SAAiB;IAC5E,MAAM,cAAc,GAAG,iCAAiC,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC1F,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,SAAiB,EACjB,OAA2C;IAE3C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}

package/dead-code-eliminator/cross-bundle/import-export-walker.js

@@ -3,7 +3,8 @@ import { bindingId } from "../reachability/binding-id.js";
 import { resolveCrossBundleTarget } from "./bundle-index.js";
 import { recordSeed, seedAllBindings } from "./seed-store.js";
 function localNameOfNamedImport(namedImport) {
-    return namedImport.getAliasNode()?.getText() ?? namedImport.getName();
+    const aliasNode = namedImport.getAliasNode();
+    return aliasNode === undefined ? namedImport.getName() : aliasNode.getText();
 }
 function isLocalBindingReachable(context, localName) {
     return context.localReachable.has(bindingId(context.sourceFilePath, localName));
@@ -46,7 +47,8 @@ function recordNamedReExportSeeds(exportDeclaration, target, seeds) {
     }
 }
 function processExportDeclaration(exportDeclaration, context) {
-    const target = resolveCrossBundleTarget(exportDeclaration.getModuleSpecifierValue(), context.indexed);
+    const specifier = exportDeclaration.getModuleSpecifierValue() ?? context.sourceFilePath;
+    const target = resolveCrossBundleTarget(specifier, context.indexed);
     if (target === undefined) {
         return;
     }

package/dead-code-eliminator/cross-bundle/import-export-walker.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-export-walker.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/cross-bundle/import-export-walker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-export-walker.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/cross-bundle/import-export-walker.ts"],"names":[],"mappings":"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"}

package/dead-code-eliminator/eliminator.js.map

@@ -1 +1 @@
-{"version":3,"file":"eliminator.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/eliminator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eliminator.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/eliminator.ts"],"names":[],"mappings":"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"}

package/dead-code-eliminator/imported-expression-origin.js

@@ -1,41 +1,40 @@
 import { Node as TsMorphNode, SyntaxKind } from 'ts-morph';
 import { unwrapExpression } from "./expression-unwrapping.js";
-function importedOriginForImportSpecifier(importSpecifier) {
-    if (importSpecifier === undefined) {
-        return undefined;
+function importedOriginForDeclaration(declaration) {
+    if (TsMorphNode.isImportSpecifier(declaration)) {
+        return {
+            from: declaration.getImportDeclaration().getModuleSpecifierValue(),
+            path: [declaration.getName()]
+        };
     }
-    return {
-        from: importSpecifier.getImportDeclaration().getModuleSpecifierValue(),
-        path: [importSpecifier.getName()]
-    };
-}
-function importedOriginForNamespaceImport(namespaceImport) {
-    if (namespaceImport === undefined) {
-        return undefined;
+    if (TsMorphNode.isNamespaceImport(declaration)) {
+        const importDeclaration = declaration.getFirstAncestorByKindOrThrow(SyntaxKind.ImportDeclaration);
+        return {
+            from: importDeclaration.getModuleSpecifierValue(),
+            path: []
+        };
     }
-    return {
-        from: namespaceImport.getFirstAncestorByKindOrThrow(SyntaxKind.ImportDeclaration).getModuleSpecifierValue(),
-        path: []
-    };
-}
-function importedOriginForDefaultImport(importClause) {
-    if (importClause === undefined) {
-        return undefined;
+    if (TsMorphNode.isImportClause(declaration)) {
+        const importDeclaration = declaration.getFirstAncestorByKindOrThrow(SyntaxKind.ImportDeclaration);
+        return {
+            from: importDeclaration.getModuleSpecifierValue(),
+            path: ['default']
+        };
     }
-    return {
-        from: importClause.getFirstAncestorByKindOrThrow(SyntaxKind.ImportDeclaration).getModuleSpecifierValue(),
-        path: ['default']
-    };
+    return undefined;
 }
 function importedOriginForIdentifier(identifier) {
     const symbol = identifier.getSymbol();
     if (symbol === undefined) {
         return undefined;
     }
-    const declarations = symbol.getDeclarations();
-    return (importedOriginForImportSpecifier(declarations.find(TsMorphNode.isImportSpecifier)) ??
-        importedOriginForNamespaceImport(declarations.find(TsMorphNode.isNamespaceImport)) ??
-        importedOriginForDefaultImport(declarations.find(TsMorphNode.isImportClause)));
+    for (const declaration of symbol.getDeclarations()) {
+        const origin = importedOriginForDeclaration(declaration);
+        if (origin !== undefined) {
+            return origin;
+        }
+    }
+    return undefined;
 }
 function originMatchesTrustedImport(origin, trustedImport) {
     if (trustedImport.from !== origin.from) {
@@ -44,11 +43,8 @@ function originMatchesTrustedImport(origin, trustedImport) {
     if (trustedImport.imports === undefined) {
         return true;
     }
-    const trustedImports = trustedImport.imports;
-    const matchingPathHead = origin.path.slice(0, 1).filter((pathPart) => {
-        return trustedImports.includes(pathPart);
-    });
-    return matchingPathHead.length === 1;
+    const [pathHead = trustedImport.from] = origin.path;
+    return pathHead !== trustedImport.from && trustedImport.imports.includes(pathHead);
 }
 function expressionOriginIsTrusted(origin, settings) {
     const pureImports = settings?.pureImports;

package/dead-code-eliminator/imported-expression-origin.js.map

@@ -1 +1 @@
-{"version":3,"file":"imported-expression-origin.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/imported-expression-origin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imported-expression-origin.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/imported-expression-origin.ts"],"names":[],"mappings":"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"}

package/dead-code-eliminator/pure-expression.js

@@ -38,70 +38,59 @@ function isPureNewExpression(expression, recurse, settings) {
         pureConstructors.includes(constructorExpression.getText()) &&
         arePureCallArguments(expression.getArguments(), recurse));
 }
-const expressionPurityRules = new Map([
-    [
-        SyntaxKind.TemplateExpression,
-        (expression, recurse) => {
-            return expression
-                .asKindOrThrow(SyntaxKind.TemplateExpression)
-                .getTemplateSpans()
-                .every((span) => {
-                return recurse(span.getExpression());
-            });
-        }
-    ],
-    [
-        SyntaxKind.ArrayLiteralExpression,
-        (expression, recurse) => {
-            return expression
-                .asKindOrThrow(SyntaxKind.ArrayLiteralExpression)
-                .getElements()
-                .every((element) => {
-                return isPureArrayElement(element, recurse);
-            });
-        }
-    ],
-    [
-        SyntaxKind.ObjectLiteralExpression,
-        (expression, recurse) => {
-            return expression
-                .asKindOrThrow(SyntaxKind.ObjectLiteralExpression)
-                .getProperties()
-                .every((property) => {
-                return isPurePropertyAssignment(property, recurse);
-            });
-        }
-    ],
-    [
-        SyntaxKind.PrefixUnaryExpression,
-        (expression, recurse) => {
-            const unary = expression.asKindOrThrow(SyntaxKind.PrefixUnaryExpression);
-            return allowedPrefixUnaryOperators.has(unary.getOperatorToken()) && recurse(unary.getOperand());
-        }
-    ],
-    [
-        SyntaxKind.BinaryExpression,
-        (expression, recurse) => {
-            const binary = expression.asKindOrThrow(SyntaxKind.BinaryExpression);
-            if (!allowedBinaryOperators.has(binary.getOperatorToken().getKind())) {
-                return false;
-            }
-            return recurse(binary.getLeft()) && recurse(binary.getRight());
-        }
-    ],
-    [
-        SyntaxKind.CallExpression,
-        (expression, recurse, settings) => {
-            return isPureCallExpression(expression.asKindOrThrow(SyntaxKind.CallExpression), recurse, settings);
-        }
-    ],
-    [
-        SyntaxKind.NewExpression,
-        (expression, recurse, settings) => {
-            return isPureNewExpression(expression.asKindOrThrow(SyntaxKind.NewExpression), recurse, settings);
-        }
-    ]
-]);
+function templateExpressionIsPure(expression, recurse) {
+    return expression
+        .asKindOrThrow(SyntaxKind.TemplateExpression)
+        .getTemplateSpans()
+        .every((span) => {
+        return recurse(span.getExpression());
+    });
+}
+function arrayLiteralExpressionIsPure(expression, recurse) {
+    return expression
+        .asKindOrThrow(SyntaxKind.ArrayLiteralExpression)
+        .getElements()
+        .every((element) => {
+        return isPureArrayElement(element, recurse);
+    });
+}
+function objectLiteralExpressionIsPure(expression, recurse) {
+    return expression
+        .asKindOrThrow(SyntaxKind.ObjectLiteralExpression)
+        .getProperties()
+        .every((property) => {
+        return isPurePropertyAssignment(property, recurse);
+    });
+}
+function prefixUnaryExpressionIsPure(expression, recurse) {
+    const unary = expression.asKindOrThrow(SyntaxKind.PrefixUnaryExpression);
+    return allowedPrefixUnaryOperators.has(unary.getOperatorToken()) && recurse(unary.getOperand());
+}
+function binaryExpressionIsPure(expression, recurse) {
+    const binary = expression.asKindOrThrow(SyntaxKind.BinaryExpression);
+    if (!allowedBinaryOperators.has(binary.getOperatorToken().getKind())) {
+        return false;
+    }
+    return recurse(binary.getLeft()) && recurse(binary.getRight());
+}
+function callExpressionIsPure(expression, recurse, settings) {
+    return isPureCallExpression(expression.asKindOrThrow(SyntaxKind.CallExpression), recurse, settings);
+}
+function newExpressionIsPure(expression, recurse, settings) {
+    return isPureNewExpression(expression.asKindOrThrow(SyntaxKind.NewExpression), recurse, settings);
+}
+function createExpressionPurityRules() {
+    return new Map([
+        [SyntaxKind.TemplateExpression, templateExpressionIsPure],
+        [SyntaxKind.ArrayLiteralExpression, arrayLiteralExpressionIsPure],
+        [SyntaxKind.ObjectLiteralExpression, objectLiteralExpressionIsPure],
+        [SyntaxKind.PrefixUnaryExpression, prefixUnaryExpressionIsPure],
+        [SyntaxKind.BinaryExpression, binaryExpressionIsPure],
+        [SyntaxKind.CallExpression, callExpressionIsPure],
+        [SyntaxKind.NewExpression, newExpressionIsPure]
+    ]);
+}
+const expressionPurityRules = createExpressionPurityRules();
 export function isPureExpression(expression, settings) {
     const unwrapped = unwrapExpression(expression);
     const recurse = (candidate) => {

package/dead-code-eliminator/pure-expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"pure-expression.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/pure-expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pure-expression.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/pure-expression.ts"],"names":[],"mappings":"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"}