From b11dce97030792a5db84f26d031418eaab55687d Mon Sep 17 00:00:00 2001
From: Niklas Widmann <nik@somethingcatchy.net>
Date: Thu, 21 Dec 2023 02:55:35 +0100
Subject: [PATCH] update pack-resolver

---
 package.json                | 2 +-
 pnpm-lock.yaml              | 8 ++++----
 src/loader/index.ts         | 2 +-
 src/loader/registry/dump.ts | 4 ++--
 src/loader/tags.ts          | 2 +-
 test/warnings.test.ts       | 6 +-----
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 2717432..26dfcd0 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
       "ts-jest": "^29.1.1"
    },
    "dependencies": {
-      "@pssbletrngle/pack-resolver": "^1.3.0",
+      "@pssbletrngle/pack-resolver": "^1.4.0",
       "@pssbletrngle/resource-merger": "^1.2.4",
       "@types/command-line-usage": "^5.0.4",
       "@types/minimatch": "^3.0.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 84dc5df..d7417f6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
   .:
     dependencies:
       '@pssbletrngle/pack-resolver':
-        specifier: ^1.3.0
-        version: 1.3.0
+        specifier: ^1.4.0
+        version: 1.4.0
       '@pssbletrngle/resource-merger':
         specifier: ^1.2.4
         version: 1.2.4
@@ -802,8 +802,8 @@ packages:
       typescript: 4.8.2
     dev: false
 
-  /@pssbletrngle/pack-resolver@1.3.0:
-    resolution: {integrity: sha512-Egvf6nQ762BlDdq6OjR2oXVcZ/jplRZ9C4DhtmWL+tfJm6sIB92ROLGQYcwAiKT4XPVO9ep78+quxErUm/O5Sg==, tarball: https://npm.pkg.github.com/download/@pssbletrngle/pack-resolver/1.3.0/bc6039ffb21a76a9a344aad313872a71606dd751}
+  /@pssbletrngle/pack-resolver@1.4.0:
+    resolution: {integrity: sha512-hLHBfS/WrJX6wWRkIjnNCh5Ek8ZavbgMSrx2l3kw8bs0e8LIuC8h/ICTqF1jDLxjZQhptgM3J5Eq79ZhTByYww==, tarball: https://npm.pkg.github.com/download/@pssbletrngle/pack-resolver/1.4.0/07151bdf2744e03dadcd30a10dc4ae551b8e563a}
     dependencies:
       fs-extra: 10.1.0
       lodash: 4.17.21
diff --git a/src/loader/index.ts b/src/loader/index.ts
index c1a99e4..cced9a8 100644
--- a/src/loader/index.ts
+++ b/src/loader/index.ts
@@ -34,7 +34,7 @@ export abstract class JsonLoader<T> implements RegistryProvider<T> {
    }
 
    readonly accept: AcceptorWithLoader = (logger, path, content) => {
-      const match = /(data|assets)[\\/](?<namespace>[\w-]+)[\\/]\w+[\\/](?<rest>[\w-\\/]+).json/.exec(path)
+      const match = /(data|assets)\/(?<namespace>[\w-]+)\/\w+\/(?<rest>[\w-/]+).json/.exec(path)
       if (!match?.groups) return false
 
       const { namespace, rest } = match.groups
diff --git a/src/loader/registry/dump.ts b/src/loader/registry/dump.ts
index 876a513..777ac57 100644
--- a/src/loader/registry/dump.ts
+++ b/src/loader/registry/dump.ts
@@ -21,11 +21,11 @@ export default class RegistryDumpLoader implements RegistryLookup {
    }
 
    private registryOf(registry: RegistryId) {
-      return this.registry.getOrPut(registry.replaceAll('\\', '/'), () => new Set<NormalizedId>())
+      return this.registry.getOrPut(registry, () => new Set<NormalizedId>())
    }
 
    private readonly accept: AcceptorWithLoader = (logger, path, content) => {
-      const match = /(?<registry>[\w-\\/]+)[\\/][\w-]+.json/.exec(path)
+      const match = /(?<registry>[\w-/]+)\/[\w-]+.json/.exec(path)
       if (!match?.groups) return false
 
       const { registry } = match.groups
diff --git a/src/loader/tags.ts b/src/loader/tags.ts
index 515039c..701c855 100644
--- a/src/loader/tags.ts
+++ b/src/loader/tags.ts
@@ -128,7 +128,7 @@ export default class TagsLoader implements TagRegistryHolder {
    }
 
    private parsePath(input: string) {
-      const match = /data[\\/](?<namespace>[\w-]+)[\\/]tags[\\/](?<rest>[\w-\\/]+).json/.exec(input)
+      const match = /data\/(?<namespace>[\w-]+)\/tags\/(?<rest>[\w-/]+).json/.exec(input)
       if (!match?.groups) return null
 
       const { namespace, rest } = match.groups
diff --git a/test/warnings.test.ts b/test/warnings.test.ts
index d7b7522..b9079fc 100644
--- a/test/warnings.test.ts
+++ b/test/warnings.test.ts
@@ -1,6 +1,5 @@
 import setupLoader from './shared/loaderSetup.js'
 import createTestAcceptor from './mock/TestAcceptor.js'
-import { join } from 'path'
 
 const { logger, loader } = setupLoader({ include: ['data/*/recipes/**/*.json'], from: 'test/resources/failing' })
 
@@ -13,9 +12,6 @@ describe('tests regarding error logging', () => {
 
       await loader.emit(acceptor)
 
-      expect(logger.warn).toHaveBeenCalledWith(
-         `${join('data', 'example', 'recipes', 'incorrectResult.json')} -> unknown result shape`,
-         120
-      )
+      expect(logger.warn).toHaveBeenCalledWith(`data/example/recipes/incorrectResult.json -> unknown result shape`, 120)
    })
 })