siarashield_workspace 0.0.58 → 0.0.60

package/schematics/ng-add/index.js

@@ -1,215 +1,215 @@
-const { chain, noop, Rule } = require('@angular-devkit/schematics');
-const { getWorkspace } = require('@schematics/angular/utility/workspace');
-
-function normalizeNewlines(text) {
-  return text.replace(/\r\n/g, '\n');
-}
-
-function addCspMetaToIndexHtml({ projectRoot, noncePlaceholder }) {
-  /** @type {Rule} */
-  return (tree) => {
-    const indexHtmlPath = `${projectRoot}/src/index.html`.replace(/\/+/g, '/');
-    if (!tree.exists(indexHtmlPath)) {
-      return tree;
-    }
-
-    const raw = tree.read(indexHtmlPath).toString('utf8');
-    const text = normalizeNewlines(raw);
-
-    const hasNonceMeta = /<meta\s+name=["']csp-nonce["']\s+/i.test(text);
-    const hasCspMeta = /<meta\s+http-equiv=["']Content-Security-Policy["']\s+/i.test(text);
-    if (hasNonceMeta && hasCspMeta) {
-      return tree;
-    }
-
-    const injection =
-      `  <meta name="csp-nonce" content="${noncePlaceholder}" />\n` +
-      `  <meta http-equiv="Content-Security-Policy" content="\n` +
-      `  default-src 'self';\n` +
-      `  script-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://embedcdn.mycybersiara.com;\n` +
-      `  script-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://embedcdn.mycybersiara.com;\n` +
-      `  script-src-attr 'none';\n` +
-      `  connect-src 'self' https://embed.mycybersiara.com https://embedcdn.mycybersiara.com;\n` +
-      `  style-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
-      `  style-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
-      `  style-src-attr 'none';\n` +
-      `  font-src 'self' https://fonts.gstatic.com https://mycybersiara.com https://cdnjs.cloudflare.com data:;\n` +
-      `  img-src 'self' data: https://embed.mycybersiara.com https://embedcdn.mycybersiara.com https://mycybersiara.com;\n` +
-      `  ">\n`;
-
-    let updated = text;
-    if (!hasNonceMeta && !hasCspMeta) {
-      updated = text.replace(/<\/head>/i, `${injection}</head>`);
-    } else if (!hasNonceMeta && hasCspMeta) {
-      updated = text.replace(
-        /(<meta\s+http-equiv=["']Content-Security-Policy["'][^>]*>)/i,
-        `  <meta name="csp-nonce" content="${noncePlaceholder}" />\n$1`,
-      );
-    } else if (hasNonceMeta && !hasCspMeta) {
-      updated = text.replace(/<\/head>/i, `  <meta http-equiv="Content-Security-Policy" content="\n` +
-        `  default-src 'self';\n` +
-        `  script-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://embedcdn.mycybersiara.com;\n` +
-        `  script-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://embedcdn.mycybersiara.com;\n` +
-        `  script-src-attr 'none';\n` +
-        `  connect-src 'self' https://embed.mycybersiara.com https://embedcdn.mycybersiara.com;\n` +
-        `  style-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
-        `  style-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
-        `  style-src-attr 'none';\n` +
-        `  font-src 'self' https://fonts.gstatic.com https://mycybersiara.com https://cdnjs.cloudflare.com data:;\n` +
-        `  img-src 'self' data: https://embed.mycybersiara.com https://embedcdn.mycybersiara.com https://mycybersiara.com;\n` +
-        `  ">\n</head>`);
-    }
-
-    if (updated !== text) {
-      tree.overwrite(indexHtmlPath, updated.replace(/\n/g, raw.includes('\r\n') ? '\r\n' : '\n'));
-    }
-    return tree;
-  };
-}
-
-function addAngularCspNonceProviderToMainTs({ projectRoot }) {
-  /** @type {Rule} */
-  return (tree) => {
-    const mainTsPath = `${projectRoot}/src/main.ts`.replace(/\/+/g, '/');
-    if (!tree.exists(mainTsPath)) {
-      return tree;
-    }
-
-    const raw = tree.read(mainTsPath).toString('utf8');
-    const text = normalizeNewlines(raw);
-
-    if (/\bCSP_NONCE\b/.test(text) && /provide\s*:\s*CSP_NONCE/.test(text)) {
-      return tree;
-    }
-
-    let updated = text;
-
-    const providerSnippet =
-      `{\n` +
-      `      provide: CSP_NONCE,\n` +
-      `      useFactory: () => document.querySelector('meta[name="csp-nonce"]')?.getAttribute('content') ?? null,\n` +
-      `    }`;
-
-    let injected = false;
-
-    // Try to inject into bootstrapApplication(..., { providers: [...] })
-    const providersArrayMatch = updated.match(/providers\s*:\s*\[\s*/);
-    if (providersArrayMatch) {
-      updated = updated.replace(/providers\s*:\s*\[\s*/m, (m) => `${m}\n    ${providerSnippet},\n`);
-      injected = true;
-    } else {
-      // If main.ts uses appConfig object, user can add provider manually; we still try a best-effort append.
-      // Insert into first bootstrapApplication call's options object.
-      const attempted = updated.replace(
-        /bootstrapApplication\(([\s\S]*?),\s*\{\s*/m,
-        (m) => `${m}\n  providers: [\n    ${providerSnippet},\n  ],\n`,
-      );
-      if (attempted !== updated) {
-        updated = attempted;
-        injected = true;
-      }
-    }
-
-    if (injected) {
-      // Ensure import exists (only if we actually injected CSP_NONCE usage in this file).
-      if (!/from\s+['"]@angular\/core['"]/.test(updated) || !/\bCSP_NONCE\b/.test(updated)) {
-        // If there's already an @angular/core import, append CSP_NONCE into it when possible.
-        const coreImportMatch = updated.match(/import\s*\{([^}]+)\}\s*from\s*['"]@angular\/core['"];\s*/);
-        if (coreImportMatch) {
-          const inside = coreImportMatch[1];
-          if (!inside.split(',').map((s) => s.trim()).includes('CSP_NONCE')) {
-            const replacement = coreImportMatch[0].replace(inside, `${inside.trim()}, CSP_NONCE`);
-            updated = updated.replace(coreImportMatch[0], replacement);
-          }
-        } else {
-          updated = `import { CSP_NONCE } from '@angular/core';\n` + updated;
-        }
-      }
-    }
-
-    if (updated !== text) {
-      tree.overwrite(mainTsPath, updated.replace(/\n/g, raw.includes('\r\n') ? '\r\n' : '\n'));
-    }
-    return tree;
-  };
-}
-
-function addAngularCspNonceProviderToAppConfig({ projectRoot }) {
-  /** @type {Rule} */
-  return (tree) => {
-    const appConfigPath = `${projectRoot}/src/app/app.config.ts`.replace(/\/+/g, '/');
-    if (!tree.exists(appConfigPath)) {
-      return tree;
-    }
-
-    const raw = tree.read(appConfigPath).toString('utf8');
-    const text = normalizeNewlines(raw);
-    if (/\bCSP_NONCE\b/.test(text) && /provide\s*:\s*CSP_NONCE/.test(text)) {
-      return tree;
-    }
-
-    // Only patch if there is a providers array in appConfig.
-    if (!/providers\s*:\s*\[\s*/m.test(text)) {
-      return tree;
-    }
-
-    let updated = text;
-    const providerSnippet =
-      `{\n` +
-      `      provide: CSP_NONCE,\n` +
-      `      useFactory: () => document.querySelector('meta[name="csp-nonce"]')?.getAttribute('content') ?? null,\n` +
-      `    }`;
-
-    updated = updated.replace(/providers\s*:\s*\[\s*/m, (m) => `${m}\n    ${providerSnippet},\n`);
-
-    // Ensure import exists.
-    const coreImportMatch = updated.match(/import\s*\{([^}]+)\}\s*from\s*['"]@angular\/core['"];\s*/);
-    if (coreImportMatch) {
-      const inside = coreImportMatch[1];
-      if (!inside.split(',').map((s) => s.trim()).includes('CSP_NONCE')) {
-        const replacement = coreImportMatch[0].replace(inside, `${inside.trim()}, CSP_NONCE`);
-        updated = updated.replace(coreImportMatch[0], replacement);
-      }
-    } else {
-      updated = `import { CSP_NONCE } from '@angular/core';\n` + updated;
-    }
-
-    if (updated !== text) {
-      tree.overwrite(appConfigPath, updated.replace(/\n/g, raw.includes('\r\n') ? '\r\n' : '\n'));
-    }
-    return tree;
-  };
-}
-
-function getProjectRoot(workspace, projectName) {
-  const project = workspace.projects.get(projectName);
-  if (!project) {
-    throw new Error(`Project "${projectName}" not found in workspace.`);
-  }
-  // For application projects, root is typically '' and sourceRoot is 'src'.
-  // We want the project root folder containing 'src'.
-  return project.root && project.root.length > 0 ? project.root : '';
-}
-
-function ngAdd(options) {
-  return async (tree, context) => {
-    const workspace = await getWorkspace(tree);
-    const projectName = options && options.project ? options.project : workspace.extensions.defaultProject;
-    if (!projectName) {
-      context.logger.warn('No project specified and no defaultProject set; skipping ng-add changes.');
-      return tree;
-    }
-
-    const projectRoot = getProjectRoot(workspace, String(projectName));
-    const noncePlaceholder = (options && options.noncePlaceholder) || 'REPLACE_WITH_NONCE';
-
-    return chain([
-      addCspMetaToIndexHtml({ projectRoot, noncePlaceholder }),
-      addAngularCspNonceProviderToAppConfig({ projectRoot }),
-      addAngularCspNonceProviderToMainTs({ projectRoot }),
-    ])(tree, context);
-  };
-}
-
-module.exports = { ngAdd };
-
+const { chain, noop, Rule } = require('@angular-devkit/schematics');
+const { getWorkspace } = require('@schematics/angular/utility/workspace');
+
+function normalizeNewlines(text) {
+  return text.replace(/\r\n/g, '\n');
+}
+
+function addCspMetaToIndexHtml({ projectRoot, noncePlaceholder }) {
+  /** @type {Rule} */
+  return (tree) => {
+    const indexHtmlPath = `${projectRoot}/src/index.html`.replace(/\/+/g, '/');
+    if (!tree.exists(indexHtmlPath)) {
+      return tree;
+    }
+
+    const raw = tree.read(indexHtmlPath).toString('utf8');
+    const text = normalizeNewlines(raw);
+
+    const hasNonceMeta = /<meta\s+name=["']csp-nonce["']\s+/i.test(text);
+    const hasCspMeta = /<meta\s+http-equiv=["']Content-Security-Policy["']\s+/i.test(text);
+    if (hasNonceMeta && hasCspMeta) {
+      return tree;
+    }
+
+    const injection =
+      `  <meta name="csp-nonce" content="${noncePlaceholder}" />\n` +
+      `  <meta http-equiv="Content-Security-Policy" content="\n` +
+      `  default-src 'self';\n` +
+      `  script-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com;\n` +
+      `  script-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com;\n` +
+      `  script-src-attr 'none';\n` +
+      `  connect-src 'self' https://embed.mycybersiara.com;\n` +
+      `  style-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
+      `  style-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
+      `  style-src-attr 'none';\n` +
+      `  font-src 'self' https://fonts.gstatic.com https://mycybersiara.com https://cdnjs.cloudflare.com data:;\n` +
+      `  img-src 'self' data: https://embed.mycybersiara.com https://mycybersiara.com;\n` +
+      `  ">\n`;
+
+    let updated = text;
+    if (!hasNonceMeta && !hasCspMeta) {
+      updated = text.replace(/<\/head>/i, `${injection}</head>`);
+    } else if (!hasNonceMeta && hasCspMeta) {
+      updated = text.replace(
+        /(<meta\s+http-equiv=["']Content-Security-Policy["'][^>]*>)/i,
+        `  <meta name="csp-nonce" content="${noncePlaceholder}" />\n$1`,
+      );
+    } else if (hasNonceMeta && !hasCspMeta) {
+      updated = text.replace(/<\/head>/i, `  <meta http-equiv="Content-Security-Policy" content="\n` +
+        `  default-src 'self';\n` +
+        `  script-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com;\n` +
+        `  script-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com;\n` +
+        `  script-src-attr 'none';\n` +
+        `  connect-src 'self' https://embed.mycybersiara.com;\n` +
+        `  style-src 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
+        `  style-src-elem 'self' 'nonce-${noncePlaceholder}' https://embed.mycybersiara.com https://mycybersiara.com https://fonts.googleapis.com https://cdnjs.cloudflare.com;\n` +
+        `  style-src-attr 'none';\n` +
+        `  font-src 'self' https://fonts.gstatic.com https://mycybersiara.com https://cdnjs.cloudflare.com data:;\n` +
+        `  img-src 'self' data: https://embed.mycybersiara.com https://mycybersiara.com;\n` +
+        `  ">\n</head>`);
+    }
+
+    if (updated !== text) {
+      tree.overwrite(indexHtmlPath, updated.replace(/\n/g, raw.includes('\r\n') ? '\r\n' : '\n'));
+    }
+    return tree;
+  };
+}
+
+function addAngularCspNonceProviderToMainTs({ projectRoot }) {
+  /** @type {Rule} */
+  return (tree) => {
+    const mainTsPath = `${projectRoot}/src/main.ts`.replace(/\/+/g, '/');
+    if (!tree.exists(mainTsPath)) {
+      return tree;
+    }
+
+    const raw = tree.read(mainTsPath).toString('utf8');
+    const text = normalizeNewlines(raw);
+
+    if (/\bCSP_NONCE\b/.test(text) && /provide\s*:\s*CSP_NONCE/.test(text)) {
+      return tree;
+    }
+
+    let updated = text;
+
+    const providerSnippet =
+      `{\n` +
+      `      provide: CSP_NONCE,\n` +
+      `      useFactory: () => document.querySelector('meta[name="csp-nonce"]')?.getAttribute('content') ?? null,\n` +
+      `    }`;
+
+    let injected = false;
+
+    // Try to inject into bootstrapApplication(..., { providers: [...] })
+    const providersArrayMatch = updated.match(/providers\s*:\s*\[\s*/);
+    if (providersArrayMatch) {
+      updated = updated.replace(/providers\s*:\s*\[\s*/m, (m) => `${m}\n    ${providerSnippet},\n`);
+      injected = true;
+    } else {
+      // If main.ts uses appConfig object, user can add provider manually; we still try a best-effort append.
+      // Insert into first bootstrapApplication call's options object.
+      const attempted = updated.replace(
+        /bootstrapApplication\(([\s\S]*?),\s*\{\s*/m,
+        (m) => `${m}\n  providers: [\n    ${providerSnippet},\n  ],\n`,
+      );
+      if (attempted !== updated) {
+        updated = attempted;
+        injected = true;
+      }
+    }
+
+    if (injected) {
+      // Ensure import exists (only if we actually injected CSP_NONCE usage in this file).
+      if (!/from\s+['"]@angular\/core['"]/.test(updated) || !/\bCSP_NONCE\b/.test(updated)) {
+        // If there's already an @angular/core import, append CSP_NONCE into it when possible.
+        const coreImportMatch = updated.match(/import\s*\{([^}]+)\}\s*from\s*['"]@angular\/core['"];\s*/);
+        if (coreImportMatch) {
+          const inside = coreImportMatch[1];
+          if (!inside.split(',').map((s) => s.trim()).includes('CSP_NONCE')) {
+            const replacement = coreImportMatch[0].replace(inside, `${inside.trim()}, CSP_NONCE`);
+            updated = updated.replace(coreImportMatch[0], replacement);
+          }
+        } else {
+          updated = `import { CSP_NONCE } from '@angular/core';\n` + updated;
+        }
+      }
+    }
+
+    if (updated !== text) {
+      tree.overwrite(mainTsPath, updated.replace(/\n/g, raw.includes('\r\n') ? '\r\n' : '\n'));
+    }
+    return tree;
+  };
+}
+
+function addAngularCspNonceProviderToAppConfig({ projectRoot }) {
+  /** @type {Rule} */
+  return (tree) => {
+    const appConfigPath = `${projectRoot}/src/app/app.config.ts`.replace(/\/+/g, '/');
+    if (!tree.exists(appConfigPath)) {
+      return tree;
+    }
+
+    const raw = tree.read(appConfigPath).toString('utf8');
+    const text = normalizeNewlines(raw);
+    if (/\bCSP_NONCE\b/.test(text) && /provide\s*:\s*CSP_NONCE/.test(text)) {
+      return tree;
+    }
+
+    // Only patch if there is a providers array in appConfig.
+    if (!/providers\s*:\s*\[\s*/m.test(text)) {
+      return tree;
+    }
+
+    let updated = text;
+    const providerSnippet =
+      `{\n` +
+      `      provide: CSP_NONCE,\n` +
+      `      useFactory: () => document.querySelector('meta[name="csp-nonce"]')?.getAttribute('content') ?? null,\n` +
+      `    }`;
+
+    updated = updated.replace(/providers\s*:\s*\[\s*/m, (m) => `${m}\n    ${providerSnippet},\n`);
+
+    // Ensure import exists.
+    const coreImportMatch = updated.match(/import\s*\{([^}]+)\}\s*from\s*['"]@angular\/core['"];\s*/);
+    if (coreImportMatch) {
+      const inside = coreImportMatch[1];
+      if (!inside.split(',').map((s) => s.trim()).includes('CSP_NONCE')) {
+        const replacement = coreImportMatch[0].replace(inside, `${inside.trim()}, CSP_NONCE`);
+        updated = updated.replace(coreImportMatch[0], replacement);
+      }
+    } else {
+      updated = `import { CSP_NONCE } from '@angular/core';\n` + updated;
+    }
+
+    if (updated !== text) {
+      tree.overwrite(appConfigPath, updated.replace(/\n/g, raw.includes('\r\n') ? '\r\n' : '\n'));
+    }
+    return tree;
+  };
+}
+
+function getProjectRoot(workspace, projectName) {
+  const project = workspace.projects.get(projectName);
+  if (!project) {
+    throw new Error(`Project "${projectName}" not found in workspace.`);
+  }
+  // For application projects, root is typically '' and sourceRoot is 'src'.
+  // We want the project root folder containing 'src'.
+  return project.root && project.root.length > 0 ? project.root : '';
+}
+
+function ngAdd(options) {
+  return async (tree, context) => {
+    const workspace = await getWorkspace(tree);
+    const projectName = options && options.project ? options.project : workspace.extensions.defaultProject;
+    if (!projectName) {
+      context.logger.warn('No project specified and no defaultProject set; skipping ng-add changes.');
+      return tree;
+    }
+
+    const projectRoot = getProjectRoot(workspace, String(projectName));
+    const noncePlaceholder = (options && options.noncePlaceholder) || 'REPLACE_WITH_NONCE';
+
+    return chain([
+      addCspMetaToIndexHtml({ projectRoot, noncePlaceholder }),
+      addAngularCspNonceProviderToAppConfig({ projectRoot }),
+      addAngularCspNonceProviderToMainTs({ projectRoot }),
+    ])(tree, context);
+  };
+}
+
+module.exports = { ngAdd };
+