@magic-xpa/cli 4.1300.0-dev4130.26 → 4.1300.0-dev4130.260

package/src/schematics/utils/devkit-utils/route-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["route-utils.ts"],"names":[],"mappings":";;AAuBA,sCAwEC;AAGD,oCAmEC;AArKD;;;;;;GAMG;AACH,iCAAiC;AACjC,2CAA6E;AAC7E,qCAA4D;AAC5D,2DAAqE;AAGrE;;;;;;;;EAQE;AAEF,SAAgB,aAAa,CAC3B,MAA2B,EAC3B,UAAoB,EACpB,UAAoB,EACpB,YAAoB,EACpB,QAAoB,EACpB,SAAS,GAAG,KAAK;IACjB,MAAM,QAAQ,GAAG,MAAM,CAAC;IACxB,MAAM,UAAU,GAAG,IAAA,qBAAS,EAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAExE,iEAAiE;IACjE,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/C,qFAAqF;QACrF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE;aACnC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;aAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAsB,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,2BAA2B;QAC3B,MAAM,OAAO,GAAc,EAAE,CAAC;QAC9B,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,qBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5E,IAAI,IAAA,qBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzD,eAAe,GAAG,IAAI,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,mDAAmD;QACnD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,IAAI,mBAAU,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAmB,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QAEtF,kCAAkC;QAClC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,WAAW,GACf,IAAA,qBAAS,EAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;gBAC1E,IAAA,qBAAS,EAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEzE,OAAO,IAAA,qCAAyB,EAAC,OAAO,EAAE,KAAK,UAAU,OAAO,YAAY,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QAC3G,CAAC;QAED,OAAO,IAAI,mBAAU,EAAE,CAAC;IAC1B,CAAC;IAED,oCAAoC;IACpC,MAAM,SAAS,GAAG,IAAA,qBAAS,EAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;SAC/D,MAAM,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC5D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjC,CAAC;IACD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACnC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACpC,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,MAAM,QAAQ,GAAG,GAAG,SAAS,UAAU,IAAI,GAAG,UAAU,OAAO,YAAY,GAAG,KAAK,EAAE;QACnF,UAAU,QAAQ,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAEzD,OAAO,IAAA,qCAAyB,EAC9B,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,EACX,EAAE,CAAC,UAAU,CAAC,aAAa,CAC5B,CAAC;AACJ,CAAC;AAGD,SAAgB,YAAY,CAAC,MAAqB,EAAE,UAAkB,EAAE,UAAkB,EAC7D,QAAgB,EAAE,SAAS,GAAG,KAAK;IAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC;IACxB,MAAM,UAAU,GAAG,IAAA,qBAAS,EAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAExE,iEAAiE;IACjE,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/C,qFAAqF;QACrF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE;aACnC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;aAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAsB,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,2BAA2B;QAC3B,MAAM,OAAO,GAAc,EAAE,CAAC;QAC9B,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,qBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5E,IAAI,IAAA,qBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzD,eAAe,GAAG,IAAI,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,mDAAmD;QACnD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,IAAI,mBAAU,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAmB,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QAEtF,kCAAkC;QAClC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,WAAW,GACf,IAAA,qBAAS,EAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;gBAC1E,IAAA,qBAAS,EAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEzE,OAAO,IAAA,qCAAyB,EAAC,OAAO,EAAE,KAAK,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,IAAI,mBAAU,EAAE,CAAC;IAC1B,CAAC;IAED,oCAAoC;IACpC,MAAM,SAAS,GAAG,IAAA,qBAAS,EAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;SAC/C,MAAM,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC5E,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjC,CAAC;IACD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACnC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACpC,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,MAAM,QAAQ,GAAG,GAAG,SAAS,UAAU,IAAI,GAAG,UAAU,GAAG,KAAK,EAAE;QAChE,UAAU,QAAQ,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAEzD,OAAO,IAAA,qCAAyB,EAC9B,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,EACX,EAAE,CAAC,UAAU,CAAC,aAAa,CAC5B,CAAC;AACJ,CAAC;AAID,SAAS,aAAa,CAAC,IAAU,EAAE,IAAY;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,gCAAmB,CAAC,kBAAkB,IAAI,GAAG,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEhF,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { findNode, findNodes, insertAfterLastOccurrence } from \"./ast-utils\";\nimport { Change, InsertChange, NoopChange } from \"./change\";\nimport {SchematicsException, Tree} from \"@angular-devkit/schematics\";\n\n\n/**\n* Add Import `import { symbolName } from fileName` if the import doesn't exit\n* already. Assumes fileToEdit can be resolved and accessed.\n* @param fileToEdit (file we want to add import to)\n* @param symbolName (item to import)\n* @param fileName (path to the file)\n* @param isDefault (if true, import follows style for importing default exports)\n* @return Change\n*/\n\nexport function insertImport2(\n  source      : ts.SourceFile,\n  fileToEdit  : string,\n  symbolName  : string,\n  asSymbolName: string,\n  fileName    : string,\n  isDefault = false): Change {\n  const rootNode = source;\n  const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);\n\n  // get nodes that map to import statements from the file fileName\n  const relevantImports = allImports.filter(node => {\n    // StringLiteral of the ImportDeclaration is the import file (fileName in this case).\n    const importFiles = node.getChildren()\n      .filter(child => child.kind === ts.SyntaxKind.StringLiteral)\n      .map(n => (n as ts.StringLiteral).text);\n\n    return importFiles.filter(file => file === fileName).length === 1;\n  });\n\n  if (relevantImports.length > 0) {\n    let importsAsterisk = false;\n    // imports from import file\n    const imports: ts.Node[] = [];\n    relevantImports.forEach(n => {\n      Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));\n      if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {\n        importsAsterisk = true;\n      }\n    });\n\n    // if imports * from fileName, don't add symbolName\n    if (importsAsterisk) {\n      return new NoopChange();\n    }\n\n    const importTextNodes = imports.filter(n => (n as ts.Identifier).text === symbolName);\n\n    // insert import if it's not there\n    if (importTextNodes.length === 0) {\n      const fallbackPos =\n        findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||\n        findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();\n\n      return insertAfterLastOccurrence(imports, `, ${symbolName} as ${asSymbolName}`, fileToEdit, fallbackPos);\n    }\n\n    return new NoopChange();\n  }\n\n  // no such import declaration exists\n  const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral)\n    .filter((n: ts.StringLiteral) => n.text === 'use strict');\n  let fallbackPos = 0;\n  if (useStrict.length > 0) {\n    fallbackPos = useStrict[0].end;\n  }\n  const open = isDefault ? '' : '{ ';\n  const close = isDefault ? '' : ' }';\n  // if there are no imports or 'use strict' statement, insert import at beginning of file\n  const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;\n  const separator = insertAtBeginning ? '' : ';\\n';\n  const toInsert = `${separator}import ${open}${symbolName} as ${asSymbolName}${close}` +\n    ` from '${fileName}'${insertAtBeginning ? ';\\n' : ''}`;\n\n  return insertAfterLastOccurrence(\n    allImports,\n    toInsert,\n    fileToEdit,\n    fallbackPos,\n    ts.SyntaxKind.StringLiteral,\n  );\n}\n\n\nexport function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string,\n                             fileName: string, isDefault = false): Change {\n  const rootNode = source;\n  const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);\n\n  // get nodes that map to import statements from the file fileName\n  const relevantImports = allImports.filter(node => {\n    // StringLiteral of the ImportDeclaration is the import file (fileName in this case).\n    const importFiles = node.getChildren()\n      .filter(child => child.kind === ts.SyntaxKind.StringLiteral)\n      .map(n => (n as ts.StringLiteral).text);\n\n    return importFiles.filter(file => file === fileName).length === 1;\n  });\n\n  if (relevantImports.length > 0) {\n    let importsAsterisk = false;\n    // imports from import file\n    const imports: ts.Node[] = [];\n    relevantImports.forEach(n => {\n      Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));\n      if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {\n        importsAsterisk = true;\n      }\n    });\n\n    // if imports * from fileName, don't add symbolName\n    if (importsAsterisk) {\n      return new NoopChange();\n    }\n\n    const importTextNodes = imports.filter(n => (n as ts.Identifier).text === symbolName);\n\n    // insert import if it's not there\n    if (importTextNodes.length === 0) {\n      const fallbackPos =\n        findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||\n        findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();\n\n      return insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);\n    }\n\n    return new NoopChange();\n  }\n\n  // no such import declaration exists\n  const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral)\n                    .filter((n: ts.StringLiteral) => n.text === 'use strict');\n  let fallbackPos = 0;\n  if (useStrict.length > 0) {\n    fallbackPos = useStrict[0].end;\n  }\n  const open = isDefault ? '' : '{ ';\n  const close = isDefault ? '' : ' }';\n  // if there are no imports or 'use strict' statement, insert import at beginning of file\n  const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;\n  const separator = insertAtBeginning ? '' : ';\\n';\n  const toInsert = `${separator}import ${open}${symbolName}${close}` +\n    ` from '${fileName}'${insertAtBeginning ? ';\\n' : ''}`;\n\n  return insertAfterLastOccurrence(\n    allImports,\n    toInsert,\n    fileToEdit,\n    fallbackPos,\n    ts.SyntaxKind.StringLiteral,\n  );\n}\n\n\n\nfunction getSourceFile(host: Tree, path: string): ts.SourceFile {\n  const buffer = host.read(path);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find ${path}.`);\n  }\n  const content = buffer.toString();\n  const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);\n\n  return source;\n}\n\n"]}
+{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["route-utils.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { findNode, findNodes, insertAfterLastOccurrence } from \"./ast-utils\";\nimport { Change, InsertChange, NoopChange } from \"./change\";\nimport {SchematicsException, Tree} from \"@angular-devkit/schematics\";\n\n\n/**\n* Add Import `import { symbolName } from fileName` if the import doesn't exit\n* already. Assumes fileToEdit can be resolved and accessed.\n* @param fileToEdit (file we want to add import to)\n* @param symbolName (item to import)\n* @param fileName (path to the file)\n* @param isDefault (if true, import follows style for importing default exports)\n* @return Change\n*/\n\nexport function insertImport2(\n  source      : ts.SourceFile,\n  fileToEdit  : string,\n  symbolName  : string,\n  asSymbolName: string,\n  fileName    : string,\n  isDefault = false): Change {\n  const rootNode = source;\n  const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);\n\n  // get nodes that map to import statements from the file fileName\n  const relevantImports = allImports.filter(node => {\n    // StringLiteral of the ImportDeclaration is the import file (fileName in this case).\n    const importFiles = node.getChildren()\n      .filter(child => child.kind === ts.SyntaxKind.StringLiteral)\n      .map(n => (n as ts.StringLiteral).text);\n\n    return importFiles.filter(file => file === fileName).length === 1;\n  });\n\n  if (relevantImports.length > 0) {\n    let importsAsterisk = false;\n    // imports from import file\n    const imports: ts.Node[] = [];\n    relevantImports.forEach(n => {\n      Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));\n      if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {\n        importsAsterisk = true;\n      }\n    });\n\n    // if imports * from fileName, don't add symbolName\n    if (importsAsterisk) {\n      return new NoopChange();\n    }\n\n    const importTextNodes = imports.filter(n => (n as ts.Identifier).text === symbolName);\n\n    // insert import if it's not there\n    if (importTextNodes.length === 0) {\n      const fallbackPos =\n        findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||\n        findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();\n\n      return insertAfterLastOccurrence(imports, `, ${symbolName} as ${asSymbolName}`, fileToEdit, fallbackPos);\n    }\n\n    return new NoopChange();\n  }\n\n  // no such import declaration exists\n  const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral)\n    .filter((n: ts.StringLiteral) => n.text === 'use strict');\n  let fallbackPos = 0;\n  if (useStrict.length > 0) {\n    fallbackPos = useStrict[0].end;\n  }\n  const open = isDefault ? '' : '{ ';\n  const close = isDefault ? '' : ' }';\n  // if there are no imports or 'use strict' statement, insert import at beginning of file\n  const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;\n  const separator = insertAtBeginning ? '' : ';\\n';\n  const toInsert = `${separator}import ${open}${symbolName} as ${asSymbolName}${close}` +\n    ` from '${fileName}'${insertAtBeginning ? ';\\n' : ''}`;\n\n  return insertAfterLastOccurrence(\n    allImports,\n    toInsert,\n    fileToEdit,\n    fallbackPos,\n    ts.SyntaxKind.StringLiteral,\n  );\n}\n\n\nexport function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string,\n                             fileName: string, isDefault = false): Change {\n  const rootNode = source;\n  const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);\n\n  // get nodes that map to import statements from the file fileName\n  const relevantImports = allImports.filter(node => {\n    // StringLiteral of the ImportDeclaration is the import file (fileName in this case).\n    const importFiles = node.getChildren()\n      .filter(child => child.kind === ts.SyntaxKind.StringLiteral)\n      .map(n => (n as ts.StringLiteral).text);\n\n    return importFiles.filter(file => file === fileName).length === 1;\n  });\n\n  if (relevantImports.length > 0) {\n    let importsAsterisk = false;\n    // imports from import file\n    const imports: ts.Node[] = [];\n    relevantImports.forEach(n => {\n      Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));\n      if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {\n        importsAsterisk = true;\n      }\n    });\n\n    // if imports * from fileName, don't add symbolName\n    if (importsAsterisk) {\n      return new NoopChange();\n    }\n\n    const importTextNodes = imports.filter(n => (n as ts.Identifier).text === symbolName);\n\n    // insert import if it's not there\n    if (importTextNodes.length === 0) {\n      const fallbackPos =\n        findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||\n        findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();\n\n      return insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);\n    }\n\n    return new NoopChange();\n  }\n\n  // no such import declaration exists\n  const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral)\n                    .filter((n: ts.StringLiteral) => n.text === 'use strict');\n  let fallbackPos = 0;\n  if (useStrict.length > 0) {\n    fallbackPos = useStrict[0].end;\n  }\n  const open = isDefault ? '' : '{ ';\n  const close = isDefault ? '' : ' }';\n  // if there are no imports or 'use strict' statement, insert import at beginning of file\n  const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;\n  const separator = insertAtBeginning ? '' : ';\\n';\n  const toInsert = `${separator}import ${open}${symbolName}${close}` +\n    ` from '${fileName}'${insertAtBeginning ? ';\\n' : ''}`;\n\n  return insertAfterLastOccurrence(\n    allImports,\n    toInsert,\n    fileToEdit,\n    fallbackPos,\n    ts.SyntaxKind.StringLiteral,\n  );\n}\n\n\n\nfunction getSourceFile(host: Tree, path: string): ts.SourceFile {\n  const buffer = host.read(path);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find ${path}.`);\n  }\n  const content = buffer.toString();\n  const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);\n\n  return source;\n}\n\n"]}

package/src/schematics/utils/html.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHeadTag = getHeadTag;
 exports.addHeadLink = addHeadLink;
+const tslib_1 = require("tslib");
 const schematics_1 = require("@angular-devkit/schematics");
-const parse5 = require("parse5");
+const parse5 = tslib_1.__importStar(require("parse5"));
 const ast_1 = require("./ast");
 const change_1 = require("./devkit-utils/change");
 /**

package/src/schematics/utils/html.js.map

@@ -1 +1 @@
-{"version":3,"file":"html.js","sourceRoot":"","sources":["html.ts"],"names":[],"mappings":";;AAWA,gCA2BC;AASD,kCAeC;AA9DD,2DAAqE;AACrE,iCAAiC;AACjC,+BAAuC;AACvC,kDAAmD;AAGnD;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAU,EAAE,GAAW;IAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAC/B,EAAC,YAAY,EAAE,IAAI,EAAC,CAAgC,CAAC;IAEvD,IAAI,IAAI,CAAC;IACT,MAAM,KAAK,GAAG,CAAC,KAAgC,EAAE,EAAE;QACjD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,MAAM,OAAO,GAA+B,IAAI,CAAC;YACjD,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;gBAC/B,IAAI,GAAG,OAAO,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;oBACvB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,gCAAmB,CAAC,yBAAyB,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS;KAC7C,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAgB,EAAE,IAAY;IACpE,MAAM,SAAS,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,qBAAY,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC7C,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC","sourcesContent":["import {Tree, SchematicsException} from '@angular-devkit/schematics';\nimport * as parse5 from 'parse5';\nimport {getIndexHtmlPath} from './ast';\nimport {InsertChange} from './devkit-utils/change';\nimport {Project} from './devkit-utils/config';\n\n/**\n * Parses the index.html file to get the HEAD tag position.\n * @param host the tree we are traversing\n * @param src the src path of the html file to parse\n */\nexport function getHeadTag(host: Tree, src: string) {\n  const document = parse5.parse(src,\n    {locationInfo: true}) as parse5.AST.Default.Document;\n\n  let head;\n  const visit = (nodes: parse5.AST.Default.Node[]) => {\n    nodes.forEach(node => {\n      const element = <parse5.AST.Default.Element>node;\n      if (element.tagName === 'head') {\n        head = element;\n      } else {\n        if (element.childNodes) {\n          visit(element.childNodes);\n        }\n      }\n    });\n  };\n\n  visit(document.childNodes);\n\n  if (!head) {\n    throw new SchematicsException('Head element not found!');\n  }\n\n  return {\n    position: head.__location.startTag.endOffset\n  };\n}\n\n/**\n * Adds a link to the index.html head tag Example:\n * `<link href=\"https://fonts.googleapis.com/css?family=Roboto:300,400,500\" rel=\"stylesheet\">`\n * @param host The tree we are updating\n * @param project The project we're targeting.\n * @param link html element string we are inserting.\n */\nexport function addHeadLink(host: Tree, project: Project, link: string) {\n  const indexPath = getIndexHtmlPath(host, project);\n  const buffer = host.read(indexPath);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find file for path: ${indexPath}`);\n  }\n\n  const src = buffer.toString();\n  if (src.indexOf(link) === -1) {\n    const node = getHeadTag(host, src);\n    const insertion = new InsertChange(indexPath, node.position, link);\n    const recorder = host.beginUpdate(indexPath);\n    recorder.insertLeft(insertion.pos, insertion.toAdd);\n    host.commitUpdate(recorder);\n  }\n}\n"]}
+{"version":3,"file":"html.js","sourceRoot":"","sources":["html.ts"],"names":[],"mappings":";;AAWA,gCA2BC;AASD,kCAeC;;AA9DD,2DAAqE;AACrE,uDAAiC;AACjC,+BAAuC;AACvC,kDAAmD;AAGnD;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAU,EAAE,GAAW;IAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAC/B,EAAC,YAAY,EAAE,IAAI,EAAC,CAAgC,CAAC;IAEvD,IAAI,IAAI,CAAC;IACT,MAAM,KAAK,GAAG,CAAC,KAAgC,EAAE,EAAE;QACjD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,MAAM,OAAO,GAA+B,IAAI,CAAC;YACjD,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;gBAC/B,IAAI,GAAG,OAAO,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;oBACvB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,gCAAmB,CAAC,yBAAyB,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS;KAC7C,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAgB,EAAE,IAAY;IACpE,MAAM,SAAS,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,qBAAY,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC7C,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC","sourcesContent":["import {Tree, SchematicsException} from '@angular-devkit/schematics';\nimport * as parse5 from 'parse5';\nimport {getIndexHtmlPath} from './ast';\nimport {InsertChange} from './devkit-utils/change';\nimport {Project} from './devkit-utils/config';\n\n/**\n * Parses the index.html file to get the HEAD tag position.\n * @param host the tree we are traversing\n * @param src the src path of the html file to parse\n */\nexport function getHeadTag(host: Tree, src: string) {\n  const document = parse5.parse(src,\n    {locationInfo: true}) as parse5.AST.Default.Document;\n\n  let head;\n  const visit = (nodes: parse5.AST.Default.Node[]) => {\n    nodes.forEach(node => {\n      const element = <parse5.AST.Default.Element>node;\n      if (element.tagName === 'head') {\n        head = element;\n      } else {\n        if (element.childNodes) {\n          visit(element.childNodes);\n        }\n      }\n    });\n  };\n\n  visit(document.childNodes);\n\n  if (!head) {\n    throw new SchematicsException('Head element not found!');\n  }\n\n  return {\n    position: head.__location.startTag.endOffset\n  };\n}\n\n/**\n * Adds a link to the index.html head tag Example:\n * `<link href=\"https://fonts.googleapis.com/css?family=Roboto:300,400,500\" rel=\"stylesheet\">`\n * @param host The tree we are updating\n * @param project The project we're targeting.\n * @param link html element string we are inserting.\n */\nexport function addHeadLink(host: Tree, project: Project, link: string) {\n  const indexPath = getIndexHtmlPath(host, project);\n  const buffer = host.read(indexPath);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find file for path: ${indexPath}`);\n  }\n\n  const src = buffer.toString();\n  if (src.indexOf(link) === -1) {\n    const node = getHeadTag(host, src);\n    const insertion = new InsertChange(indexPath, node.position, link);\n    const recorder = host.beginUpdate(indexPath);\n    recorder.insertLeft(insertion.pos, insertion.toAdd);\n    host.commitUpdate(recorder);\n  }\n}\n"]}

package/templates/angular/src/{app.module.ts → app-module.ts}

@@ -2,7 +2,7 @@ import {BrowserModule} from '@angular/platform-browser';
 import {NgModule} from '@angular/core';
 import {ReactiveFormsModule} from '@angular/forms';
 
-import {AppComponent} from './app.component';
+import {App} from './app';
 import {DynamicModule} from 'ng-dynamic-component';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {ComponentArray, compHash, title} from './component-list.g';
@@ -30,7 +30,7 @@ import {MagicModule,ComponentListMagicService} from '@magic-xpa/angular';
 
 
 @NgModule({
-   declarations: [AppComponent, ...ComponentArray],
+   declarations: [App, ...ComponentArray],
    imports: [
       // Angular modules
       BrowserModule,
@@ -59,7 +59,7 @@ import {MagicModule,ComponentListMagicService} from '@magic-xpa/angular';
       InfiniteScrollDirective,
       DynamicModule.withComponents(ComponentArray)
    ],
-   bootstrap: [AppComponent],
+   bootstrap: [App],
 })
 export class AppModule {
    constructor(componentList:ComponentListMagicService) {

package/templates/angular/src/app.routes.ts

@@ -1,10 +1,12 @@
 import {Routes, RouterModule} from '@angular/router';
 import {RouterContainerMagicComponent} from  "@magic-xpa/angular";
+import {customRoutes} from './custom.routes';
 
 import { CommonModule } from "@angular/common";
 import { NgModule }  from '@angular/core';
 
  export const routes: Routes = [
+    ...customRoutes,
     <%- startRanderForRootModule (createRootRoute); -%>
     <%- renderRoutes (routesArray, createRootRoute); -%>
     <%- endRanderForRootModule (createRootRoute); -%>

package/templates/angular/src/{app.component.ts → app.ts}

@@ -12,5 +12,5 @@ declare let myExtObject: any;
     `,
     standalone: false,
   })
-export class AppComponent {
+export class App {
 }

package/templates/angular/src/custom.routes.ts

@@ -0,0 +1,23 @@
+import { Routes } from '@angular/router';
+import { RouterContainerMagicComponent } from "@magic-xpa/angular";
+
+/**
+ * Custom Routes
+ * =============
+ * Add your custom/manual routes in this file.
+ *
+ * IMPORTANT: This file is NOT affected by CLI route regeneration.
+ * The generated app.routes.ts automatically imports these routes.
+ *
+ * Custom routes are placed BEFORE generated routes in the final
+ * routes array, so they take PRIORITY when paths conflict.
+ *
+ * Example:
+ *   {
+ *       path: 'callPublic/:name',
+ *       component: RouterContainerMagicComponent,
+ *   },
+ */
+export const customRoutes: Routes = [
+
+];

package/templates/attributes/common/row_editing_button_attributes.ejs

@@ -1,10 +1,10 @@
 <% if (ctrl.props.is_table_child && ctrl.controlType === MgControlType.CTRL_TYPE_BUTTON) {%>
   <% if ( ctrl.props.row_editing_type && ctrl.props.row_editing_type !== RowEditingTypes.NoneRowEditing) {%>
     <% if ( ctrl.props.row_editing_type === RowEditingTypes.EnterRowEditing) {%>
-      *ngIf="!mg.isRowInRowEditing(row)"
+      [hidden]="mg.isRowInRowEditing(row)"
     <%}%>
     <% if ( ctrl.props.row_editing_type === RowEditingTypes.SaveRowEditing || ctrl.props.row_editing_type === RowEditingTypes.CancelRowEditing) {%>
-*ngIf="mg.isRowInRowEditing(row)"
+[hidden]="!mg.isRowInRowEditing(row)"
 <%}%>
   <%}%>
 <%}%>

package/templates/component/view.component.ts

@@ -25,9 +25,8 @@ import { MgDisplayedColumns} from "./<%- id %>.mg.controls.g";
  <% } else {%>
   import {TaskBaseMagicComponent, magicProviders} from  "@magic-xpa/angular";
 <%}%>
-<% if(isModal) { %>
-  import {MagicModalInterface} from  "@magic-xpa/angular";
-<%}%>
+  import {MagicModalProperties} from  "@magic-xpa/angular";
+<%= '\n' %>
 
 @Component({
     selector: '<%= selector %>',
@@ -36,9 +35,11 @@ import { MgDisplayedColumns} from "./<%- id %>.mg.controls.g";
     templateUrl: './<%- id %>.component.html'
 })
 
-export class <%- id %> extends <% if(useMatGrid) { %>  BaseMatTableMagicComponent <% } else {%> TaskBaseMagicComponent     <%}%> <% if(isModal) { %> implements MagicModalInterface <% }%>
+export class <%- id %> extends <% if(useMatGrid) { %>  BaseMatTableMagicComponent <% } else {%> TaskBaseMagicComponent     <%}%>
 
 {
+  magicModalProperties: MagicModalProperties = new MagicModalProperties("<%- id %>", true, 0, 0, "300px", "300px", true, true, true, true);
+
   <% if(!magicConfig.no_controls_accessor) { %>
   mgc = MgControlName;
   mgcp = MgCustomProperties;
@@ -55,58 +56,6 @@ export class <%- id %> extends <% if(useMatGrid) { %>  BaseMatTableMagicComponen
   }
   <%}-%>
 
-  <% if(isModal) { -%>
-    private static readonly formName: string = "<%- id %>";
-    private static readonly showTitleBar: boolean = true;
-    private static readonly x: number = 0;
-    private static readonly y: number = 0;
-    private static readonly width: string = "300px";
-    private static readonly height: string = "300px";
-    private static readonly isCenteredToWindow: boolean = true;
-    private static readonly shouldCloseOnBackgroundClick: boolean = true;
-    private static readonly isResizable: boolean = true;
-    private static readonly isMovable: boolean = true;
-
-    X() {
-        return <%- id %>.x;
-    }
-
-    Y() {
-        return <%- id %>.y;
-    }
-
-    Width(): string {
-        return <%- id %>.width;
-    }
-
-    Height(): string {
-        return <%- id %>.height;
-    }
-
-    IsCenteredToWindow() {
-        return <%- id %>.isCenteredToWindow;
-    }
-
-    FormName() {
-        return <%- id %>.formName;
-    }
-
-    ShowTitleBar() {
-        return <%- id %>.showTitleBar;
-    }
-
-    ShouldCloseOnBackgroundClick() {
-      return <%- id %>.shouldCloseOnBackgroundClick;
-    }
-
-    IsResizable() {
-      return <%- id %>.isResizable;
-    }
-
-    IsMovable() {
-      return <%- id %>.isMovable;
-    }
-    <%}-%>
     <% if(useMatGrid) { -%>
     override displayedColumns = this.mgdp;
     <%}-%>

package/templates/themes/basicHTML/combobox.ejs

@@ -6,32 +6,35 @@
 
   <%# show combo box in table only while we on row edit  %>
   <% if (ctrl.props.is_table_child) { %>
-  <div *ngIf="mg.isRowInRowEditing(row)">
+  @if (mg.isRowInRowEditing(row)) {
+  <div>
     <%}%>
         <select
                 <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
                 <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
                 <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
         >
-            <option
-                    *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>);"
-                    [selected]="o.index == mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
-                    [value] = "o.index"
-            >
+            @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
+            <option [selected]="o.index == mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
+                    [value] = "o.index">
                 {{o.displayValue}}
             </option>
+            }
         </select>
             <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
     <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
             <%}%>
   <% if (ctrl.props.is_table_child) { %>
      </div>
+     }
 
      <%# show lable in table only while we on row read only  %>
-     <div *ngIf="!mg.isRowInRowEditing(row)">
+     @if (!mg.isRowInRowEditing(row)) {
+     <div>
           <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
           {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
           </label>
      </div>
+     }
   <%}%>
 </div>

package/templates/themes/basicHTML/edit.ejs

@@ -8,7 +8,8 @@
                 <div  >
                 <% if (ctrl.style &&  ctrl.style.multiline_edit ){ %>
 
-                <textarea *ngIf="mg.isRowInRowEditing(row)"
+                @if (mg.isRowInRowEditing(row)) {
+                <textarea
                         type="text"
                         <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
                         <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
@@ -20,20 +21,21 @@
                         <% if (ctrl.props.validator) { %><%- ctrl.props.validator %><%}%>
                 >
                 </textarea>
+                }
 
                 <% } else { %>
+                <% if(ctrl.props.is_table_child){ %>
+                  @if (mg.isRowInRowEditing(row)) {
+                <%}%>
                 <input
                   <% if (ctrl.props.show_zoom_button  ){ %>
                   style="width: 70%"
                   <% } %>
                   <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
-                  <% if(ctrl.props.is_table_child){ %>
-                    *ngIf="mg.isRowInRowEditing(row)"
-                  <%}%>
 
                   <% if (ctrl.props.attribute == StorageAttributeType.Numeric) { %>
                     <% if (ctrl.props.currency) { %>
-                      currencyMask [options]="mg.getNumericPicture(mg.getPicture(<%- ctrl.props.enum_id %>))"
+                      [currencyMask]="mg.getNumericPicture(mg.getPicture(<%- ctrl.props.enum_id %>))"
                     <% } else { %>
                       type='number'
                     <% } %>
@@ -52,13 +54,16 @@
                         <%- ' '%>
                         <% if (ctrl.props.validator) { %><%- ctrl.props.validator %><%}%>
                 />
+                <% if(ctrl.props.is_table_child){ %>
+                  }
+                <%}%>
                 <% } %>
                   <%- include(`../../attributes/common/input/validation`, {ctrl : ctrl}) %>
 
                   <% if(ctrl.props.is_table_child){ %>
 
+                  @if (!mg.isRowInRowEditing(row)) {
                   <label
-                      *ngIf="!mg.isRowInRowEditing(row)"
                      <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
                      <% if (ctrl.props.currency  ) { %>
                        {{mg.getFormattedValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
@@ -71,6 +76,7 @@
 
 
                   </label>
+                  }
                   <%}%>
                   <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
                 </div>
@@ -78,8 +84,8 @@
         case StorageAttributeType.Date: %>
 
      <% if(ctrl.props.is_table_child){ %>
+     @if (mg.isRowInRowEditing(row)) {
      <div
-       *ngIf="mg.isRowInRowEditing(row)"
        style="display: flex; flex-direction: row">
        <%}%>
 
@@ -102,24 +108,26 @@
 
        <% if(ctrl.props.is_table_child){ %>
      </div>
+     }
      <%}%>
 
 
      <% if(ctrl.props.is_table_child){ %>
+     @if (!mg.isRowInRowEditing(row)) {
      <label
-       *ngIf="!mg.isRowInRowEditing(row)"
        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
        {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
        <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
      </label>
+     }
      <%}%>
        <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
         <% break;
 
         case StorageAttributeType.Time: %>
      <% if(ctrl.props.is_table_child){ %>
+     @if (mg.isRowInRowEditing(row)) {
      <div
-       *ngIf="mg.isRowInRowEditing(row)"
        style="display: flex; flex-direction: row">
        <%}%>
 
@@ -141,15 +149,17 @@
 
        <% if(ctrl.props.is_table_child){ %>
      </div>
+     }
      <%}%>
 
      <% if(ctrl.props.is_table_child){ %>
+     @if (!mg.isRowInRowEditing(row)) {
      <label
-       *ngIf="!mg.isRowInRowEditing(row)"
        <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
        {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)
        <% if (ctrl.props.formatter) { %>| <%- ctrl.props.formatter %> : <%- ctrl.props.enum_id %><%}%>}}
      </label>
+     }
      <%}%>
        <%- include('./zoom-button.ejs', {ctrl : ctrl}) %>
         <% break;

package/templates/themes/basicHTML/image.ejs

@@ -1,6 +1,7 @@
-
-<div *ngIf="mg.isImageExists(<%- ctrl.props.enum_id %>)">
+@if (mg.isImageExists(<%- ctrl.props.enum_id %>)) {
+<div>
     <img    <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
             <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
             [src]="mg.getImage(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)" />
 </div>
+}

package/templates/themes/basicHTML/listbox.ejs

@@ -8,12 +8,11 @@
         <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
 >
     <%# build of items in listbox %>
-    <option
-            *ngFor="let o of mg.getItemListValues(<%-ctrl.props.enum_id%>);"
-            [value] = "o.index"
-    >
+    @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%>); track $index) {
+    <option [value] = "o.index">
         {{o.displayValue}}
     </option>
+    }
 </select>
     <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
       <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>

package/templates/themes/basicHTML/push-button.ejs

@@ -25,4 +25,3 @@ case CtrlButtonTypeGui.Hypertext : %>
   <%- include('../../attributes/common/format.ejs', {ctrl : ctrl}) %>
 </button>
 <% } %> %>
-

package/templates/themes/basicHTML/radio.ejs

@@ -1,9 +1,20 @@
+<%# Wrap in a row-specific formGroup if this radio control is child of a table %>
 <div
+  <% if (ctrl.props.is_table_child && (typeof ctrl.props.web_style === "undefined" || ctrl.props.web_style === TableWebStyle.MatGrid)) { %>
+  [formGroup]="mg.getFormGroupByRow(row.rowId)"
+  <%}%>
+>
+  <%# Render radio buttons group if in edit mode, otherwise render a static display label %>
+  <% if (ctrl.props.is_table_child) { %>
+  @if (mg.isRowInRowEditing(row)) {
+  <% } %>
+  <div
      <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-     (change)="task.mgOnRadioSelectionChanged(<%-ctrl.props.enum_id%>)"
+     (change)="task.mgOnRadioSelectionChanged(<%-ctrl.props.enum_id%><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
      >
-     <div
-        *ngFor="let o of mg.getItemListValues(<%-ctrl.props.enum_id%>);">
+     <%# Get the options and display values, passing the row.rowId if it is a table control %>
+     @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
+     <div>
         <label>
            <input
                 type="radio"
@@ -14,7 +25,17 @@
            {{o.displayValue}}
         </label>
      </div>
+     }
     <% if (ctrl.props.must_input || ctrl.props.validator != null) {%>
     <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
     <%}%>
+  </div>
+  <% if (ctrl.props.is_table_child) { %>
+  }
+  @if (!mg.isRowInRowEditing(row)) {
+  <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+      {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
+  </label>
+  }
+  <% } %>
 </div>

package/templates/themes/basicHTML/tab.ejs

@@ -12,7 +12,8 @@
         <% }%>
 
         <%# add buttons for each tab page%>
-        <div  *ngFor="let o of mg.getItemListValues(<%-ctrl.props.enum_id%>)">
+        @for (o of mg.getItemListValues(<%-ctrl.props.enum_id%>); track $index) {
+        <div>
             <button class="tab_button"
                     <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
                     (click)="task.mgOnTabSelectionChanged(<%-ctrl.props.enum_id%>, o.index)"
@@ -21,6 +22,7 @@
                 {{mg.getTabpageText(<%- ctrl.props.enum_id %>, o.index)}}
             </button>
         </div>
+        }
 
         <% if ( tab_side == SideType.Top) { %>
             <%# add tab pages after adding the buttons, so the buttons are at the top%>

package/templates/themes/basicHiddenHTML/radio.ejs

@@ -2,8 +2,8 @@
         <%- include('../../attributes/common/no_control_base_attributes', {ctrl : ctrl}) %>
         magicMark="magicRadio"
 >
-    <div
-            *ngFor="let o of mgGetListboxValues(<%-ctrl.props.enum_id%>);">
+    @for (o of mgGetListboxValues(<%-ctrl.props.enum_id%>); track $index) {
+    <div>
         <label>
             <input
                     type="radio"
@@ -14,4 +14,5 @@
             {{o.displayValue}}
         </label>
     </div>
+    }
 </div>

package/templates/themes/basicHiddenHTML/table.ejs

@@ -7,12 +7,16 @@
      (scrolled)="tableService.onScrollDown()"
      [scrollWindow]="false"
 >
-    <div *ngFor="let row of task.Records.list">
-        <div *ngIf="mg.ifRowCreated(row)" id="row">
+    @for (row of task.Records.list; track $index) {
+        <div>
+        @if (mg.ifRowCreated(row)) {
+        <div id="row">
             <form [formGroup]="mg.getFormGroupByRow(row.rowId)" class="table_row"
                   [ngClass]="{ 'selected': mg.isRowSelected(<%= ctrl.props.enum_id %>, row.rowId)}">
                 <%- include(`../container`, {ctrl: ctrl}) %>
             </form>
         </div>
-    </div>
+        }
+        </div>
+    }
 </div>

package/templates/themes/container.ejs

@@ -6,6 +6,9 @@
         <% if (line_id !== null) {%>
             <% if( typeof child.props.common_line_id === "undefined" || child.props.common_line_id !== line_id) {%>
                 </div>
+                <% if (ctrl.props.web_style === TableWebStyle.MatGrid) { %>
+                }
+                <% } %>
                 <% line_id = null;%>
         <%}}%>
 
@@ -13,7 +16,12 @@
             <% if (line_id === null && typeof child.props.common_line_id !== "undefined" &&
                     child.controlType !== MgControlType.CTRL_TYPE_TAB) { %>
                          <% line_id = child.props.common_line_id; %>
-                        <div style="display: flex; flex-direction: row"  <% if (  ctrl.props.web_style === TableWebStyle.MatGrid) { %>*ngIf="mg.ifRowCreated(row)" <%}%>   >
+                        <% if (ctrl.props.web_style === TableWebStyle.MatGrid) { %>
+                        @if (mg.ifRowCreated(row)) {
+                        <div style="display: flex; flex-direction: row">
+                        <% } else { %>
+                        <div style="display: flex; flex-direction: row">
+                        <% } %>
             <%}%>
 
                 <%- include(`./control`, {child: child}) %>
@@ -23,4 +31,7 @@
     <%# close the line-wrapping div, in case it was left open %>
     <%if (line_id !== null) {%>
         </div>
+        <% if (ctrl.props.web_style === TableWebStyle.MatGrid) { %>
+        }
+        <% } %>
 <%}} %>

package/templates/themes/material/combobox.ejs

@@ -6,11 +6,14 @@
 
   <%# show combo box in table only while we on row edit  %>
   <% if (ctrl.props.is_table_child) { %>
-  <div *ngIf="mg.isRowInRowEditing(row)">
+  @if (mg.isRowInRowEditing(row)) {
+  <div>
     <%}%>
 
     <% if (ctrl.props.editable) { %>
+      <mat-form-field   <%- include('../../attributes/common/container_attributes', {ctrl : ctrl}) %>>
           <editable-combo
+                <%- include('../../attributes/common/base/visible',       {ctrl : ctrl})%>
                 <%- include(`../../attributes/common/control_attributes`, {ctrl : ctrl})%>
                 <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
                 <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
@@ -19,6 +22,7 @@
                 placeholder="Type/Select an option"
           >
           </editable-combo>
+      </mat-form-field>
     <% }else { %>
 
     <mat-form-field   <%- include('../../attributes/common/container_attributes', {ctrl : ctrl}) %>>
@@ -29,13 +33,11 @@
                 required
                 <% } %>
         >
-            <mat-option
-                    *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>);"
-
-                    [value]="o.index"
-            >
+            @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
+            <mat-option [value]="o.index">
                 {{o.displayValue}}
             </mat-option>
+            }
         </mat-select>
     </mat-form-field>
 
@@ -47,12 +49,15 @@
 
     <% if (ctrl.props.is_table_child) { %>
     </div>
+    }
     <%# show lable in table only while we on row read only  %>
-     <div *ngIf="!mg.isRowInRowEditing(row)">
+     @if (!mg.isRowInRowEditing(row)) {
+     <div>
          <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
              {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
           </label>
      </div>
+     }
      <%}%>
 
   </div>