@ng-doc/builder 15.11.3 → 15.12.0

package/helpers/generate-api-entities.js

@@ -5,30 +5,53 @@ const tslib_1 = require("tslib");
 const core_1 = require("@ng-doc/core");
 const glob = tslib_1.__importStar(require("glob"));
 const engine_1 = require("../engine");
-const is_not_excluded_path_1 = require("./is-not-excluded-path");
 const is_supported_declaration_1 = require("./is-supported-declaration");
 /**
  *
  * @param apiRootEntity
  */
 function generateApiEntities(apiRootEntity) {
-    var _a;
+    var _a, _b;
     const result = [];
-    (_a = apiRootEntity.target) === null || _a === void 0 ? void 0 : _a.scopes.forEach((scope) => {
+    const scopes = new Map();
+    const duplicatesInScope = new Map();
+    const paths = (_b = (_a = apiRootEntity.target) === null || _a === void 0 ? void 0 : _a.scopes.map((scope) => {
         const scopeEntity = new engine_1.NgDocApiScopeEntity(apiRootEntity.builder, apiRootEntity.sourceFile, apiRootEntity.context, apiRootEntity, scope);
+        const files = (0, core_1.asArray)(scope.include)
+            .map((i) => glob.sync(i, {
+            ignore: scope.exclude,
+            absolute: true,
+        }))
+            .flat();
+        files.forEach((f) => scopes.set(f, scopeEntity));
         result.push(scopeEntity);
-        (0, core_1.asArray)(scope.include).forEach((include) => (0, core_1.asArray)(new Set(apiRootEntity.builder.project
-            .addSourceFilesAtPaths(glob.sync(include).filter((p) => (0, is_not_excluded_path_1.isNotExcludedPath)(p, (0, core_1.asArray)(scope.exclude))))
-            .map((sourceFile) => (0, core_1.asArray)(sourceFile.getExportedDeclarations().values()))
-            .flat(2)))
-            .filter(is_supported_declaration_1.isSupportedDeclaration)
-            .forEach((declaration, _i, declarations) => {
-            const name = declaration.getName();
-            const duplicates = declarations.filter((d) => d.getName() === name && d.getKindName() === declaration.getKindName());
-            if (name) {
-                result.push(new engine_1.NgDocApiPageEntity(apiRootEntity.builder, declaration.getSourceFile(), apiRootEntity.context, scopeEntity, name, duplicates.indexOf(declaration)));
+        return files;
+    }).flat()) !== null && _b !== void 0 ? _b : [];
+    apiRootEntity.builder.project
+        .addSourceFilesAtPaths(paths)
+        .map((sourceFile) => sourceFile.getExportedDeclarations())
+        .reduce((acc, declarations) => {
+        declarations.forEach((value, key) => {
+            const existing = acc.get(key);
+            const supported = value.filter(is_supported_declaration_1.isSupportedDeclaration);
+            existing ? acc.set(key, (0, core_1.asArray)(new Set(existing.concat(supported)))) : acc.set(key, supported);
+        });
+        return acc;
+    }, new Map())
+        .forEach((declarations, name) => {
+        declarations.forEach((declaration) => {
+            var _a, _b;
+            const sourceFile = declaration.getSourceFile();
+            const scope = scopes.get(sourceFile.getFilePath());
+            if (scope) {
+                const duplicates = (_a = duplicatesInScope.get(scope)) !== null && _a !== void 0 ? _a : new Map();
+                const count = (_b = duplicates.get(name)) !== null && _b !== void 0 ? _b : 0;
+                const page = new engine_1.NgDocApiPageEntity(apiRootEntity.builder, sourceFile, apiRootEntity.context, scope, name, count);
+                duplicates.set(name, count + 1);
+                duplicatesInScope.set(scope, duplicates);
+                result.push(page);
             }
-        }));
+        });
     });
     return result;
 }

package/helpers/generate-api-entities.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-api-entities.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/generate-api-entities.ts"],"names":[],"mappings":";;;;AAAA,uCAAoD;AACpD,mDAA6B;AAG7B,sCAAkF;AAElF,iEAAyD;AACzD,yEAAkE;AAElE;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,aAA6B;;IAChE,MAAM,MAAM,GAAoD,EAAE,CAAC;IAEnE,MAAA,aAAa,CAAC,MAAM,0CAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAoB,EAAE,EAAE;QAC7D,MAAM,WAAW,GAAwB,IAAI,4BAAmB,CAC/D,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,UAAU,EACxB,aAAa,CAAC,OAAO,EACrB,aAAa,EACb,KAAK,CACL,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEzB,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE,CAClD,IAAA,cAAO,EACN,IAAI,GAAG,CACN,aAAa,CAAC,OAAO,CAAC,OAAO;aAC3B,qBAAqB,CACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,wCAAiB,EAAC,CAAC,EAAE,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CACtF;aACA,GAAG,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;aACvF,IAAI,CAAC,CAAC,CAAC,CACT,CACD;aACC,MAAM,CAAC,iDAAsB,CAAC;aAC9B,OAAO,CACP,CACC,WAAuC,EACvC,EAAU,EACV,YAA0C,EACzC,EAAE;YACH,MAAM,IAAI,GAAuB,WAAW,CAAC,OAAO,EAAE,CAAC;YACvD,MAAM,UAAU,GAAiC,YAAY,CAAC,MAAM,CACnE,CAAC,CAA6B,EAAE,EAAE,CACjC,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,WAAW,EAAE,CACtE,CAAC;YAEF,IAAI,IAAI,EAAE;gBACT,MAAM,CAAC,IAAI,CACV,IAAI,2BAAkB,CACrB,aAAa,CAAC,OAAO,EACrB,WAAW,CAAC,aAAa,EAAE,EAC3B,aAAa,CAAC,OAAO,EACrB,WAAW,EACX,IAAI,EACJ,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAC/B,CACD,CAAC;aACF;QACF,CAAC,CACD,CACF,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC;AAxDD,kDAwDC"}
+{"version":3,"file":"generate-api-entities.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/generate-api-entities.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@ng-doc/builder",
-  "version": "15.11.3",
+  "version": "15.12.0",
   "type": "commonjs",
   "builders": "./builders.json",
   "schematics": "./schematics/collection.json",
   "dependencies": {
-    "@ng-doc/core": "15.11.3",
-    "@ng-doc/utils": "15.11.3",
+    "@ng-doc/core": "15.12.0",
+    "@ng-doc/utils": "15.12.0",
     "@angular-devkit/architect": ">=0.1500.0",
     "chokidar": "3.5.3",
     "minimatch": "5.1.0",