@atlaspack/resolver-glob 2.14.5-canary.171 → 2.14.5-canary.173

package/lib/GlobResolver.js

@@ -57,9 +57,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const jsAssetTypes = new Set(['jsx', 'ts', 'tsx', 'mjs', 'mts', 'cts']);
-function errorToThrowableDiagnostic(error,
-// @ts-expect-error TS2304
-dependency) {
+function errorToThrowableDiagnostic(error, dependency) {
   return new (_diagnostic().default)({
     diagnostic: {
       message: error,
@@ -70,7 +68,6 @@ dependency) {
   });
 }
 var _default = exports.default = new (_plugin().Resolver)({
-  // @ts-expect-error TS2322
   async resolve({
     dependency,
     options,
@@ -97,8 +94,6 @@ var _default = exports.default = new (_plugin().Resolver)({
     if (error) {
       throw errorToThrowableDiagnostic(error, dependency);
     }
-
-    // @ts-expect-error TS2304
     let invalidateOnFileCreate = [];
     let invalidateOnFileChange = new Set();
     switch (specifier[0]) {
@@ -237,11 +232,7 @@ var _default = exports.default = new (_plugin().Resolver)({
     };
   }
 });
-function set(
-// @ts-expect-error TS7006
-obj, path,
-// @ts-expect-error TS2304
-value) {
+function set(obj, path, value) {
   for (let i = 0; i < path.length - 1; i++) {
     let part = path[i];
     if (obj[part] == null) {
@@ -251,8 +242,6 @@ value) {
   }
   obj[path[path.length - 1]] = value;
 }
-
-// @ts-expect-error TS7006
 function generate(matches, isAsync, indent = '', count = 0) {
   if (typeof matches === 'string') {
     if (isAsync) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/resolver-glob",
-  "version": "2.14.5-canary.171+f0349a6b9",
+  "version": "2.14.5-canary.173+f93000336",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,10 +16,11 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.239+f0349a6b9",
-    "@atlaspack/node-resolver-core": "3.5.5-canary.171+f0349a6b9",
-    "@atlaspack/plugin": "2.14.5-canary.171+f0349a6b9",
-    "@atlaspack/utils": "2.14.5-canary.171+f0349a6b9",
+    "@atlaspack/diagnostic": "2.14.1-canary.241+f93000336",
+    "@atlaspack/node-resolver-core": "3.5.5-canary.173+f93000336",
+    "@atlaspack/plugin": "2.14.5-canary.173+f93000336",
+    "@atlaspack/types": "2.14.5-canary.173+f93000336",
+    "@atlaspack/utils": "2.14.5-canary.173+f93000336",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
@@ -27,5 +28,5 @@
     "check-ts": "tsc --emitDeclarationOnly --rootDir src",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "f0349a6b9b04755088f121095ca6301a2ada3767"
+  "gitHead": "f930003364fdc31e5487520ebe256f1a9389f579"
 }

package/src/GlobResolver.ts

@@ -6,6 +6,11 @@ import {
   relativePath,
   normalizeSeparators,
 } from '@atlaspack/utils';
+import type {
+  Dependency,
+  FileCreateInvalidation,
+  FilePath,
+} from '@atlaspack/types';
 import path from 'path';
 import nullthrows from 'nullthrows';
 import ThrowableDiagnostic, {
@@ -18,7 +23,6 @@ const jsAssetTypes = new Set(['jsx', 'ts', 'tsx', 'mjs', 'mts', 'cts']);
 
 function errorToThrowableDiagnostic(
   error: string,
-  // @ts-expect-error TS2304
   dependency: Dependency,
 ): ThrowableDiagnostic {
   return new ThrowableDiagnostic({
@@ -38,7 +42,6 @@ function errorToThrowableDiagnostic(
 }
 
 export default new Resolver({
-  // @ts-expect-error TS2322
   async resolve({dependency, options, specifier, pipeline, logger}) {
     if (!isGlob(specifier)) {
       return;
@@ -69,9 +72,8 @@ export default new Resolver({
       throw errorToThrowableDiagnostic(error, dependency);
     }
 
-    // @ts-expect-error TS2304
     let invalidateOnFileCreate: Array<FileCreateInvalidation> = [];
-    let invalidateOnFileChange = new Set();
+    let invalidateOnFileChange = new Set<string>();
 
     switch (specifier[0]) {
       // Path specifier
@@ -230,10 +232,8 @@ export default new Resolver({
 }) as Resolver<unknown>;
 
 function set(
-  // @ts-expect-error TS7006
-  obj,
+  obj: Record<string, any>,
   path: Array<never> | Array<string>,
-  // @ts-expect-error TS2304
   value: FilePath | string,
 ) {
   for (let i = 0; i < path.length - 1; i++) {
@@ -249,8 +249,12 @@ function set(
   obj[path[path.length - 1]] = value;
 }
 
-// @ts-expect-error TS7006
-function generate(matches, isAsync: boolean, indent = '', count = 0) {
+function generate(
+  matches: Record<string, any>,
+  isAsync: boolean,
+  indent = '',
+  count = 0,
+) {
   if (typeof matches === 'string') {
     if (isAsync) {
       return {