feat(models): handle trailing separators for package directories

Signed-off-by: Lexus Drumgold <[email protected]>

Author: unicornware

src/models/__tests__/err-invalid-package-target.spec.ts

@@ -14,7 +14,7 @@ describe('unit:models/ERR_INVALID_PACKAGE_TARGET', () => {
 
   beforeEach(() => {
     base = import.meta.url
-    dir = process.cwd() + '/'
+    dir = process.cwd()
     key = '.'
     target = 'dist/index.mjs'
   })
@@ -43,23 +43,23 @@ describe('unit:models/ERR_INVALID_PACKAGE_TARGET', () => {
         target,
         undefined,
         undefined,
-        `Invalid "exports" main target "${target}" defined in the package config ${dir}package.json; targets must start with "./"`
+        `Invalid "exports" main target "${target}" defined in the package config ${dir}/package.json; targets must start with "./"`
       ],
       [
-        dir,
+        dir + '/',
         key + '/utils',
         'dist/utils.mjs',
         undefined,
         undefined,
-        `Invalid "exports" target "dist/utils.mjs" defined for './utils' in the package config ${dir}package.json; targets must start with "./"`
+        `Invalid "exports" target "dist/utils.mjs" defined for './utils' in the package config ${dir}/package.json; targets must start with "./"`
       ],
       [
-        '',
+        dir,
         '#src',
         'src/index.ts',
         true,
         base,
-        `Invalid "imports" target "src/index.ts" defined for '#src' in the package config package.json imported from ${base}`
+        `Invalid "imports" target "src/index.ts" defined for '#src' in the package config ${dir}/package.json imported from ${base}`
       ]
     ]
 

src/models/__tests__/err-package-import-not-defined.spec.ts

@@ -42,7 +42,7 @@ describe('unit:models/ERR_PACKAGE_IMPORT_NOT_DEFINED', () => {
         specifier,
         base,
         dir,
-        `${message} in package ${dir}package.json imported from ${base}`
+        `${message} in package ${dir}/package.json imported from ${base}`
       ]
     ]
 

src/models/__tests__/err-package-path-not-exported.spec.ts

@@ -13,7 +13,7 @@ describe('unit:models/ERR_PACKAGE_PATH_NOT_EXPORTED', () => {
 
   beforeEach(() => {
     base = import.meta.url
-    dir = process.cwd() + 'node_modules/@flex-development/errnode/'
+    dir = process.cwd() + '/' + 'node_modules/@flex-development/errnode'
     subpath = '.'
   })
 
@@ -39,25 +39,25 @@ describe('unit:models/ERR_PACKAGE_PATH_NOT_EXPORTED', () => {
         dir,
         subpath,
         undefined,
-        `No 'exports' main defined in ${dir}package.json`
+        `No 'exports' main defined in ${dir}/package.json`
       ],
       [
-        dir,
+        dir + '/',
         subpath,
         base,
-        `No 'exports' main defined in ${dir}package.json imported from ${base}`
+        `No 'exports' main defined in ${dir}/package.json imported from ${base}`
       ],
       [
         dir,
         subpath + '/internal/format-message',
         undefined,
-        `Package subpath '${subpath}/internal/format-message' is not defined by 'exports' in ${dir}package.json`
+        `Package subpath '${subpath}/internal/format-message' is not defined by 'exports' in ${dir}/package.json`
       ],
       [
         dir,
         subpath + '/utils/create-node-error',
         base,
-        `Package subpath '${subpath}/utils/create-node-error' is not defined by 'exports' in ${dir}package.json imported from ${base}`
+        `Package subpath '${subpath}/utils/create-node-error' is not defined by 'exports' in ${dir}/package.json imported from ${base}`
       ]
     ]
 

src/models/err-invalid-package-target.ts

@@ -82,7 +82,7 @@ const ERR_INVALID_PACKAGE_TARGET: NodeErrorConstructor<
     if (!main) ret += ` for '${key}'`
 
     // add package.json location
-    ret += ` in the package config ${dir}package.json`
+    ret += ` in the package config ${dir.replace(/\/$/, '')}/package.json`
 
     // add import location
     if (base) ret += ` imported from ${base}`

src/models/err-package-import-not-defined.ts

@@ -50,7 +50,7 @@ const ERR_PACKAGE_IMPORT_NOT_DEFINED: NodeErrorConstructor<
     let message: string = `Package import specifier '${specifier}' is not defined`
 
     // add package.json location
-    if (dir) message += ` in package ${dir}package.json`
+    if (dir) message += ` in package ${dir.replace(/\/$/, '')}/package.json`
 
     // add import location
     message += ` imported from ${base}`

src/models/err-package-path-not-exported.ts

@@ -53,7 +53,7 @@ const ERR_PACKAGE_PATH_NOT_EXPORTED: NodeErrorConstructor<
         : `Package subpath '${subpath}' is not defined by 'exports' in`
 
     // add package.json location
-    message += ` ${dir}package.json`
+    message += ` ${dir.replace(/\/$/, '')}/package.json`
 
     // add import location
     if (base) message += ` imported from ${base}`