@ms-cloudpack/path-string-parsing 1.1.1 → 1.1.3

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { safeRelativePath } from './safeRelativePath.js';
 export { slash } from './slash.js';
 export { parseImportString, type ImportStringResult } from './parseImportString.js';
+export { parseNamedImports } from './parseNamedImports.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC"}

package/lib/index.js

@@ -1,4 +1,5 @@
 export { safeRelativePath } from './safeRelativePath.js';
 export { slash } from './slash.js';
 export { parseImportString } from './parseImportString.js';
+export { parseNamedImports } from './parseNamedImports.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAA2B,MAAM,wBAAwB,CAAC","sourcesContent":["export { safeRelativePath } from './safeRelativePath.js';\nexport { slash } from './slash.js';\nexport { parseImportString, type ImportStringResult } from './parseImportString.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAA2B,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC","sourcesContent":["export { safeRelativePath } from './safeRelativePath.js';\nexport { slash } from './slash.js';\nexport { parseImportString, type ImportStringResult } from './parseImportString.js';\nexport { parseNamedImports } from './parseNamedImports.js';\n"]}

package/lib/parseImportString.js

@@ -14,7 +14,7 @@ import { safeRelativePath } from './safeRelativePath.js';
 export function parseImportString(importString = '') {
     const matches = importString.match(
     //   1: packageName          2: version      3: importPath
-    /^\/?((?:@[-\w.]+\/)?[-\w.]+)(?:@([-\w.]+))?(?:\/([-\w./]+))?/) || [];
+    /^\/?((?:@[-\w.:]+\/)?[-\w.:]+)(?:@([-\w.]+))?(?:\/([-\w./]+))?/) || [];
     return {
         packageName: matches[1] || '.',
         version: matches[2] || '',

package/lib/parseImportString.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseImportString.js","sourceRoot":"","sources":["../src/parseImportString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAazD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,YAAY,GAAG,EAAE;IACjD,MAAM,OAAO,GACX,YAAY,CAAC,KAAK;IAChB,0DAA0D;IAC1D,8DAA8D,CAC/D,IAAI,EAAE,CAAC;IAEV,OAAO;QACL,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG;QAC9B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QACzB,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC;AACJ,CAAC","sourcesContent":["import { safeRelativePath } from './safeRelativePath.js';\n\nexport type ImportStringResult = {\n  packageName: string;\n  /** Optional package version (default: empty string) */\n  version: string;\n  /**\n   * Optional import path (default: `'.'`).\n   * If this is set to a non-default value, it will be normalized to start with `./`.\n   */\n  importPath: string;\n};\n\n/**\n * Parse an import path: usually this will be a standard JS import, but this function also allows\n * an optional `@version` suffix after the package name.\n *\n * Examples of supported import strings:\n * - `foo`\n * - `foo@1.2.3`\n * - `foo@1.2.3/path/to/file`\n * - `@foo/bar`\n * - `@foo/bar@1.2.3`\n * - `@foo/bar@1.2.3/path/to/file`\n */\nexport function parseImportString(importString = ''): ImportStringResult {\n  const matches =\n    importString.match(\n      //   1: packageName          2: version      3: importPath\n      /^\\/?((?:@[-\\w.]+\\/)?[-\\w.]+)(?:@([-\\w.]+))?(?:\\/([-\\w./]+))?/,\n    ) || [];\n\n  return {\n    packageName: matches[1] || '.',\n    version: matches[2] || '',\n    importPath: safeRelativePath(matches[3]),\n  };\n}\n"]}
+{"version":3,"file":"parseImportString.js","sourceRoot":"","sources":["../src/parseImportString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAazD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,YAAY,GAAG,EAAE;IACjD,MAAM,OAAO,GACX,YAAY,CAAC,KAAK;IAChB,0DAA0D;IAC1D,gEAAgE,CACjE,IAAI,EAAE,CAAC;IAEV,OAAO;QACL,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG;QAC9B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QACzB,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC;AACJ,CAAC","sourcesContent":["import { safeRelativePath } from './safeRelativePath.js';\n\nexport type ImportStringResult = {\n  packageName: string;\n  /** Optional package version (default: empty string) */\n  version: string;\n  /**\n   * Optional import path (default: `'.'`).\n   * If this is set to a non-default value, it will be normalized to start with `./`.\n   */\n  importPath: string;\n};\n\n/**\n * Parse an import path: usually this will be a standard JS import, but this function also allows\n * an optional `@version` suffix after the package name.\n *\n * Examples of supported import strings:\n * - `foo`\n * - `foo@1.2.3`\n * - `foo@1.2.3/path/to/file`\n * - `@foo/bar`\n * - `@foo/bar@1.2.3`\n * - `@foo/bar@1.2.3/path/to/file`\n */\nexport function parseImportString(importString = ''): ImportStringResult {\n  const matches =\n    importString.match(\n      //   1: packageName          2: version      3: importPath\n      /^\\/?((?:@[-\\w.:]+\\/)?[-\\w.:]+)(?:@([-\\w.]+))?(?:\\/([-\\w./]+))?/,\n    ) || [];\n\n  return {\n    packageName: matches[1] || '.',\n    version: matches[2] || '',\n    importPath: safeRelativePath(matches[3]),\n  };\n}\n"]}

package/lib/parseNamedImports.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Parses an import string into its component parts.
+ * @param importLine - The import string to parse.
+ * @returns A string array with the named imports, default and/or '*'.
+ */
+export declare function parseNamedImports(importLine: string): string[];
+//# sourceMappingURL=parseNamedImports.d.ts.map

package/lib/parseNamedImports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseNamedImports.d.ts","sourceRoot":"","sources":["../src/parseNamedImports.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CA6B9D"}

package/lib/parseNamedImports.js

@@ -0,0 +1,32 @@
+/**
+ * Parses an import string into its component parts.
+ * @param importLine - The import string to parse.
+ * @returns A string array with the named imports, default and/or '*'.
+ */
+export function parseNamedImports(importLine) {
+    // Regex from: https://github.com/antonkc/MOR/blob/main/matchJsImports.md
+    // With some edits to catch exports * from "package".
+    const matches = importLine.match(/(?<=(?:[\s\n;])|^)(?:(?:import|export)[\s\n]*((?:(?<=[\s\n])type)?)(?=[\n\s*{])[\s\n]*)((?:(?:[_$\w][_$\w0-9]*)(?:[\s\n]+(?:as[\s\n]+(?:[_$\w][_$\w0-9]*)))?(?=(?:[\n\s]*,[\n\s]*[{*])|(?:[\n\s]+from)))?)[\s\n,]*((?:\*[\n\s]*(?:as[\s\n]+(?:[_$\w][_$\w0-9]*))(?=[\n\s]+from))?|\*)[\s\n,]*((?:\{[n\s]*(?:(?:[_$\w][_$\w0-9]*)(?:[\s\n]+(?:as[\s\n]+(?:[_$\w][_$\w0-9]*)))?[\s\n]*,?[\s\n]*)*\}(?=[\n\s]*from))?)(?:[\s\n]*((?:from)?))[\s\n]*(?:["']([^"']*)(["']))[\s\n]*?;?/);
+    const names = [];
+    // If no matches return empty array
+    if (matches === null) {
+        return names;
+    }
+    // If there is a default export, push it to the names array
+    if (matches[2]) {
+        names.push('default');
+    }
+    // If there is a namespace export, push it to the names array
+    if (matches[4]) {
+        // Clean out the braces, whitespace, and get alias
+        const namedImports = matches[4].matchAll(/([\w$]+)(?:\s+as\s+[\w$]+(?:,)?)?/g);
+        for (const namedImport of namedImports) {
+            names.push(namedImport[1]);
+        }
+    }
+    if (matches[3]) {
+        names.push('*');
+    }
+    return names;
+}
+//# sourceMappingURL=parseNamedImports.js.map

package/lib/parseNamedImports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseNamedImports.js","sourceRoot":"","sources":["../src/parseNamedImports.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAAkB;IAClD,yEAAyE;IACzE,qDAAqD;IACrD,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAC9B,kdAAkd,CACnd,CAAC;IACF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,mCAAmC;IACnC,IAAI,OAAO,KAAK,IAAI,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IACD,2DAA2D;IAC3D,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACvB;IACD,6DAA6D;IAC7D,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;QACd,kDAAkD;QAClD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oCAAoC,CAAC,CAAC;QAC/E,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;KACF;IAED,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACjB;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/**\n * Parses an import string into its component parts.\n * @param importLine - The import string to parse.\n * @returns A string array with the named imports, default and/or '*'.\n */\nexport function parseNamedImports(importLine: string): string[] {\n  // Regex from: https://github.com/antonkc/MOR/blob/main/matchJsImports.md\n  // With some edits to catch exports * from \"package\".\n  const matches = importLine.match(\n    /(?<=(?:[\\s\\n;])|^)(?:(?:import|export)[\\s\\n]*((?:(?<=[\\s\\n])type)?)(?=[\\n\\s*{])[\\s\\n]*)((?:(?:[_$\\w][_$\\w0-9]*)(?:[\\s\\n]+(?:as[\\s\\n]+(?:[_$\\w][_$\\w0-9]*)))?(?=(?:[\\n\\s]*,[\\n\\s]*[{*])|(?:[\\n\\s]+from)))?)[\\s\\n,]*((?:\\*[\\n\\s]*(?:as[\\s\\n]+(?:[_$\\w][_$\\w0-9]*))(?=[\\n\\s]+from))?|\\*)[\\s\\n,]*((?:\\{[n\\s]*(?:(?:[_$\\w][_$\\w0-9]*)(?:[\\s\\n]+(?:as[\\s\\n]+(?:[_$\\w][_$\\w0-9]*)))?[\\s\\n]*,?[\\s\\n]*)*\\}(?=[\\n\\s]*from))?)(?:[\\s\\n]*((?:from)?))[\\s\\n]*(?:[\"']([^\"']*)([\"']))[\\s\\n]*?;?/,\n  );\n  const names: string[] = [];\n  // If no matches return empty array\n  if (matches === null) {\n    return names;\n  }\n  // If there is a default export, push it to the names array\n  if (matches[2]) {\n    names.push('default');\n  }\n  // If there is a namespace export, push it to the names array\n  if (matches[4]) {\n    // Clean out the braces, whitespace, and get alias\n    const namedImports = matches[4].matchAll(/([\\w$]+)(?:\\s+as\\s+[\\w$]+(?:,)?)?/g);\n    for (const namedImport of namedImports) {\n      names.push(namedImport[1]);\n    }\n  }\n\n  if (matches[3]) {\n    names.push('*');\n  }\n\n  return names;\n}\n"]}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.36.4"
+      "packageVersion": "7.38.3"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/path-string-parsing",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Common path-related string parsing utilities for Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -28,5 +28,10 @@
   },
   "files": [
     "lib/**/!(*.test.*)"
-  ]
+  ],
+  "beachball": {
+    "disallowedChangeTypes": [
+      "prerelease"
+    ]
+  }
 }