@valbuild/server 0.48.0 → 0.48.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -731,19 +731,16 @@ globalThis.valModule = {
731
731
  } else {
732
732
  result.value.dispose();
733
733
  const valModule = context.getProp(context.global, "valModule").consume(context.dump);
734
- if (!valModule) {
735
- fatalErrors.push(`Could not find any modules at: ${id}`);
736
- } else if (valModule.defaultExport) {
734
+ if (
735
+ // if one of these are set it is a Val module, so must validate
736
+ (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
737
737
  if (valModule.id !== id) {
738
738
  fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
739
- }
740
- if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
739
+ } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
741
740
  fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
742
- }
743
- if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
741
+ } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
744
742
  fatalErrors.push(`Expected val id: '${id}' to have a schema`);
745
- }
746
- if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
743
+ } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
747
744
  fatalErrors.push(`Expected val id: '${id}' to have a source`);
748
745
  }
749
746
  }
@@ -731,19 +731,16 @@ globalThis.valModule = {
731
731
  } else {
732
732
  result.value.dispose();
733
733
  const valModule = context.getProp(context.global, "valModule").consume(context.dump);
734
- if (!valModule) {
735
- fatalErrors.push(`Could not find any modules at: ${id}`);
736
- } else if (valModule.defaultExport) {
734
+ if (
735
+ // if one of these are set it is a Val module, so must validate
736
+ (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
737
737
  if (valModule.id !== id) {
738
738
  fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
739
- }
740
- if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
739
+ } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
741
740
  fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
742
- }
743
- if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
741
+ } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
744
742
  fatalErrors.push(`Expected val id: '${id}' to have a schema`);
745
- }
746
- if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
743
+ } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
747
744
  fatalErrors.push(`Expected val id: '${id}' to have a source`);
748
745
  }
749
746
  }
@@ -701,19 +701,16 @@ globalThis.valModule = {
701
701
  } else {
702
702
  result.value.dispose();
703
703
  const valModule = context.getProp(context.global, "valModule").consume(context.dump);
704
- if (!valModule) {
705
- fatalErrors.push(`Could not find any modules at: ${id}`);
706
- } else if (valModule.defaultExport) {
704
+ if (
705
+ // if one of these are set it is a Val module, so must validate
706
+ (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
707
707
  if (valModule.id !== id) {
708
708
  fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
709
- }
710
- if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
709
+ } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
711
710
  fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
712
- }
713
- if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
711
+ } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
714
712
  fatalErrors.push(`Expected val id: '${id}' to have a schema`);
715
- }
716
- if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
713
+ } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
717
714
  fatalErrors.push(`Expected val id: '${id}' to have a source`);
718
715
  }
719
716
  }
package/package.json CHANGED
@@ -12,7 +12,7 @@
12
12
  "./package.json": "./package.json"
13
13
  },
14
14
  "types": "dist/valbuild-server.cjs.d.ts",
15
- "version": "0.48.0",
15
+ "version": "0.48.1",
16
16
  "scripts": {
17
17
  "typecheck": "tsc --noEmit",
18
18
  "test": "jest",
@@ -24,9 +24,9 @@
24
24
  "concurrently": "^7.6.0"
25
25
  },
26
26
  "dependencies": {
27
- "@valbuild/core": "~0.48.0",
28
- "@valbuild/shared": "~0.48.0",
29
- "@valbuild/ui": "~0.48.0",
27
+ "@valbuild/core": "~0.48.1",
28
+ "@valbuild/shared": "~0.48.1",
29
+ "@valbuild/ui": "~0.48.1",
30
30
  "express": "^4.18.2",
31
31
  "image-size": "^1.0.2",
32
32
  "queue": "^6.0.2",