@vendure/ngx-translate-extract - npm Package Compare versions

Comparing version 8.3.0 to 9.0.0

dist/cli/cli.d.ts

 export declare const cli: any;

dist/cli/cli.js

@@ -0,0 +0,0 @@ import yargs from 'yargs';

dist/cli/tasks/extract.task.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../../utils/translation.collection.js';

dist/cli/tasks/extract.task.js

@@ -0,0 +0,0 @@ import { cyan, green, bold, dim, red } from 'colorette';

dist/cli/tasks/task.interface.d.ts

 export interface TaskInterface {
     execute(): void;
 }

dist/cli/tasks/task.interface.js

 export {};
 //# sourceMappingURL=task.interface.js.map

dist/compilers/compiler.factory.d.ts

@@ -0,0 +0,0 @@ import { CompilerInterface } from './compiler.interface.js';

dist/compilers/compiler.factory.js

@@ -0,0 +0,0 @@ import { JsonCompiler } from './json.compiler.js';

dist/compilers/compiler.interface.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/compilers/compiler.interface.js

 export {};
 //# sourceMappingURL=compiler.interface.js.map

dist/compilers/json.compiler.d.ts

@@ -0,0 +0,0 @@ import { CompilerInterface } from './compiler.interface.js';

dist/compilers/json.compiler.js

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/compilers/namespaced-json.compiler.d.ts

@@ -0,0 +0,0 @@ import { CompilerInterface } from './compiler.interface.js';

dist/compilers/namespaced-json.compiler.js

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/compilers/po.compiler.d.ts

@@ -0,0 +0,0 @@ import { CompilerInterface } from './compiler.interface.js';

dist/compilers/po.compiler.js

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/index.d.ts

@@ -0,0 +0,0 @@ export * from './utils/translation.collection.js';

dist/index.js

@@ -0,0 +0,0 @@ export * from './utils/translation.collection.js';

dist/parsers/directive.parser.d.ts

@@ -1,4 +0,12 @@
-import { AST, LiteralPrimitive, TmplAstBoundAttribute as BoundAttribute, TmplAstElement as Element, TmplAstNode as Node, TmplAstTemplate as Template, TmplAstText as Text, TmplAstTextAttribute as TextAttribute } from '@angular/compiler';
+import { AST, LiteralPrimitive, TmplAstBoundAttribute as BoundAttribute, TmplAstElement as Element, TmplAstNode as Node, TmplAstTemplate as Template, TmplAstText as Text, TmplAstTextAttribute as TextAttribute, ParseSourceSpan } from '@angular/compiler';
 import { ParserInterface } from './parser.interface.js';
 import { TranslationCollection } from '../utils/translation.collection.js';
+interface BlockNode {
+    nameSpan: ParseSourceSpan;
+    sourceSpan: ParseSourceSpan;
+    startSourceSpan: ParseSourceSpan;
+    endSourceSpan: ParseSourceSpan | null;
+    children: Node[] | undefined;
+    visit<Result>(visitor: unknown): Result;
+}
 export declare const TRANSLATE_ATTR_NAMES: string[];
@@ -9,2 +17,3 @@ type ElementLike = Element | Template;
     protected getElementsWithTranslateAttribute(nodes: Node[]): ElementLike[];
+    protected getElementsWithTranslateAttributeFromBlockNodes(blockNode: BlockNode): ElementLike[];
     protected getTextNodes(element: ElementLike): Text[];
@@ -17,2 +26,3 @@ protected hasAttributes(element: ElementLike, name: string[]): boolean;
     protected isElementLike(node: Node): node is ElementLike;
+    protected isBlockNode(node: Node): node is BlockNode;
     protected isText(node: Node): node is Text;
@@ -19,0 +29,0 @@ protected parseTemplate(template: string, path: string): Node[];

dist/parsers/directive.parser.js

@@ -1,2 +0,2 @@
-import { ASTWithSource, Binary, BindingPipe, Conditional, Interpolation, LiteralArray, LiteralMap, LiteralPrimitive, parseTemplate, TmplAstElement as Element, TmplAstTemplate as Template, TmplAstText as Text } from '@angular/compiler';
+import { ASTWithSource, Binary, BindingPipe, Conditional, Interpolation, LiteralArray, LiteralMap, LiteralPrimitive, parseTemplate, TmplAstElement as Element, TmplAstTemplate as Template, TmplAstText as Text, TmplAstIfBlock, TmplAstSwitchBlock, TmplAstForLoopBlock, TmplAstDeferredBlock } from '@angular/compiler';
 import { TranslationCollection } from '../utils/translation.collection.js';
@@ -47,4 +47,25 @@ import { extractComponentInlineTemplate, isPathAngularComponent } from '../utils/utils.js';
         });
+        nodes.filter(this.isBlockNode).forEach((node) => elements.push(...this.getElementsWithTranslateAttributeFromBlockNodes(node)));
         return elements;
     }
+    getElementsWithTranslateAttributeFromBlockNodes(blockNode) {
+        let blockChildren = blockNode.children;
+        if (blockNode instanceof TmplAstIfBlock) {
+            blockChildren = blockNode.branches.map((branch) => branch.children).flat();
+        }
+        if (blockNode instanceof TmplAstSwitchBlock) {
+            blockChildren = blockNode.cases.map((branch) => branch.children).flat();
+        }
+        if (blockNode instanceof TmplAstForLoopBlock) {
+            const emptyBlockChildren = blockNode.empty?.children ?? [];
+            blockChildren.push(...emptyBlockChildren);
+        }
+        if (blockNode instanceof TmplAstDeferredBlock) {
+            const placeholderBlockChildren = blockNode.placeholder?.children ?? [];
+            const loadingBlockChildren = blockNode.loading?.children ?? [];
+            const errorBlockChildren = blockNode.error?.children ?? [];
+            blockChildren.push(...placeholderBlockChildren, ...loadingBlockChildren, ...errorBlockChildren);
+        }
+        return this.getElementsWithTranslateAttribute(blockChildren);
+    }
     getTextNodes(element) {
@@ -100,2 +121,8 @@ return element.children.filter(this.isText);
     }
+    isBlockNode(node) {
+        return (node.hasOwnProperty('nameSpan') &&
+            node.hasOwnProperty('sourceSpan') &&
+            node.hasOwnProperty('startSourceSpan') &&
+            node.hasOwnProperty('endSourceSpan'));
+    }
     isText(node) {
@@ -102,0 +129,0 @@ return node instanceof Text;

dist/parsers/function.parser.d.ts

@@ -0,0 +0,0 @@ import { ParserInterface } from './parser.interface.js';

dist/parsers/function.parser.js

@@ -0,0 +0,0 @@ import { tsquery } from '@phenomnomnominal/tsquery';

dist/parsers/marker.parser.d.ts

@@ -0,0 +0,0 @@ import { ParserInterface } from './parser.interface.js';

dist/parsers/marker.parser.js

@@ -0,0 +0,0 @@ import { tsquery } from '@phenomnomnominal/tsquery';

dist/parsers/parser.interface.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/parsers/parser.interface.js

 export {};
 //# sourceMappingURL=parser.interface.js.map

dist/parsers/pipe.parser.d.ts

@@ -6,4 +6,5 @@ import { AST, TmplAstNode, BindingPipe, LiteralPrimitive, Conditional } from '@angular/compiler';
 export declare class PipeParser implements ParserInterface {
-    extract(source: string, filePath: string): TranslationCollection | null;
+    extract(source: string, filePath: string): TranslationCollection;
     protected findPipesInNode(node: any): BindingPipe[];
+    protected extractPipesFromChildNodes(nodeChildren: TmplAstNode[]): BindingPipe[];
     protected parseTranslationKeysFromPipe(pipeContent: BindingPipe | LiteralPrimitive | Conditional): string[];
@@ -10,0 +11,0 @@ protected getTranslatablesFromAst(ast: AST): BindingPipe[];

dist/parsers/pipe.parser.js

@@ -21,9 +21,16 @@ import { parseTemplate, BindingPipe, LiteralPrimitive, Conditional, Binary, LiteralMap, LiteralArray, Interpolation, Call } from '@angular/compiler';
     findPipesInNode(node) {
-        let ret = [];
-        if (node?.children) {
-            ret = node.children.reduce((result, childNode) => {
-                const children = this.findPipesInNode(childNode);
-                return result.concat(children);
-            }, [ret]);
+        const ret = [];
+        const nodeChildren = node?.children ?? [];
+        const nodeBranchesOrCases = node?.branches ?? node?.cases ?? [];
+        const emptyBlockChildren = node?.empty?.children ?? [];
+        const errorBlockChildren = node?.error?.children ?? [];
+        const loadingBlockChildren = node?.loading?.children ?? [];
+        const placeholderBlockChildren = node?.placeholder?.children ?? [];
+        nodeChildren.push(...emptyBlockChildren, ...errorBlockChildren, ...loadingBlockChildren, ...placeholderBlockChildren);
+        if (nodeChildren.length > 0) {
+            ret.push(...this.extractPipesFromChildNodes(nodeChildren));
         }
+        nodeBranchesOrCases.forEach((branch) => {
+            ret.push(...this.extractPipesFromChildNodes(branch.children));
+        });
         if (node?.value?.ast) {
@@ -34,3 +41,3 @@ ret.push(...this.getTranslatablesFromAst(node.value.ast));
             const translateableAttributes = node.attributes.filter((attr) => TRANSLATE_PIPE_NAMES.includes(attr.name));
-            ret = [...ret, ...translateableAttributes];
+            ret.push(...ret, ...translateableAttributes);
         }
@@ -53,2 +60,5 @@ if (node?.inputs) {
     }
+    extractPipesFromChildNodes(nodeChildren) {
+        return nodeChildren.map((childNode) => this.findPipesInNode(childNode)).flat();
+    }
     parseTranslationKeysFromPipe(pipeContent) {
@@ -55,0 +65,0 @@ const ret = [];

dist/parsers/service.parser.d.ts

@@ -0,0 +0,0 @@ import { ClassDeclaration, CallExpression, SourceFile } from 'typescript';

dist/parsers/service.parser.js

@@ -0,0 +0,0 @@ import { tsquery } from '@phenomnomnominal/tsquery';

dist/post-processors/key-as-default-value.post-processor.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/key-as-default-value.post-processor.js

@@ -0,0 +0,0 @@ export class KeyAsDefaultValuePostProcessor {

dist/post-processors/null-as-default-value.post-processor.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/null-as-default-value.post-processor.js

@@ -0,0 +0,0 @@ export class NullAsDefaultValuePostProcessor {

dist/post-processors/post-processor.interface.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/post-processor.interface.js

 export {};
 //# sourceMappingURL=post-processor.interface.js.map

dist/post-processors/purge-obsolete-keys.post-processor.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/purge-obsolete-keys.post-processor.js

@@ -0,0 +0,0 @@ export class PurgeObsoleteKeysPostProcessor {

dist/post-processors/sort-by-key.post-processor.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/sort-by-key.post-processor.js

@@ -0,0 +0,0 @@ export class SortByKeyPostProcessor {

dist/post-processors/string-as-default-value.post-processor.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/string-as-default-value.post-processor.js

@@ -0,0 +0,0 @@ export class StringAsDefaultValuePostProcessor {

dist/post-processors/strip-prefix.post-processor.d.ts

@@ -0,0 +0,0 @@ import { TranslationCollection } from '../utils/translation.collection.js';

dist/post-processors/strip-prefix.post-processor.js

@@ -0,0 +0,0 @@ export class StripPrefixPostProcessor {

dist/utils/ast-helpers.d.ts

@@ -0,0 +0,0 @@ import pkg, { Node, NamedImports, ClassDeclaration, ConstructorDeclaration, CallExpression, Expression } from 'typescript';

dist/utils/ast-helpers.js

@@ -0,0 +0,0 @@ import { tsquery } from '@phenomnomnominal/tsquery';

dist/utils/fs-helpers.d.ts

@@ -0,0 +0,0 @@ declare module 'braces' {

dist/utils/fs-helpers.js

@@ -0,0 +0,0 @@ import * as os from 'os';

dist/utils/translation.collection.d.ts

@@ -0,0 +0,0 @@ export interface TranslationType {

dist/utils/translation.collection.js

@@ -0,0 +0,0 @@ export class TranslationCollection {

dist/utils/utils.d.ts

 export declare function isPathAngularComponent(path: string): boolean;
 export declare function extractComponentInlineTemplate(contents: string): string;
 export declare function stripBOM(contents: string): string;

dist/utils/utils.js

@@ -0,0 +0,0 @@ export function isPathAngularComponent(path) {

package.json

 {
   "name": "@vendure/ngx-translate-extract",
-  "version": "8.3.0",
+  "version": "9.0.0",
   "description": "Extract strings from projects using ngx-translate",
@@ -28,2 +28,3 @@ "author": "Kim Biesbjerg <[e-mail]>",
   "devDependencies": {
+    "@angular/compiler": "^17.0.3",
     "@types/braces": "^3.0.1",
@@ -37,5 +38,5 @@ "@types/chai": "^4.3.3",
     "@types/yargs": "^17.0.20",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/eslint-plugin-tslint": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/eslint-plugin-tslint": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
     "chai": "^4.3.6",
@@ -51,7 +52,7 @@ "cross-env": "^7.0.3",
     "ts-node": "^10.4.0",
-    "typescript": "^4.5.2"
+    "typescript": "~5.2.2"
   },
   "peerDependencies": {
-    "@angular/compiler": ">=13.1.2",
-    "typescript": ">=4.4.0"
+    "@angular/compiler": ">=17.0.0",
+    "typescript": ">=5.2.0"
   },
@@ -93,3 +94,3 @@ "main": "dist/index.js",
   "engines": {
-    "node": ">=16",
+    "node": ">=18.13.0",
     "npm": ">=8"
@@ -96,0 +97,0 @@ },

README.md

@@ -29,5 +29,5 @@ # ngx-translate-extract
 | ---------- | ------------------------------------------------------------------------------------------ |
-| 14         | 8.x.x+                                                                                     |
-| 13         | 8.x.x+                                                                                     |
-| 8.x – 12.x | [@biesbjerg/ngx-translate-extract](https://github.com/biesbjerg/ngx-translate-extract) 7.x |
+| >=17       | 9.x                                                                                        |
+| 13 – 16    | 8.x                                                                                        |
+| 8  – 12    | [@biesbjerg/ngx-translate-extract](https://github.com/biesbjerg/ngx-translate-extract) 7.x |
 
@@ -34,0 +34,0 @@ Add a script to your project's `package.json`:

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

121267

increased by2.77%

Lines of code

1470

increased by3.45%

Worsened metrics

Dev dependency count

23

increased by4.55%

No dependency changes