react-native-asset 2.2.12 → 2.2.13

package/esm/clean-assets/android.js

@@ -2,11 +2,11 @@ import * as dntShim from "../_dnt.shims.js";
 import * as path from "../deps/jsr.io/@std/path/1.1.4/mod.js";
 export default async function cleanAssetsAndroid(filePaths, _platformConfig, options) {
     console.log(`options path in cleanAssetsAndroid: ${options.path}`);
-    for (const p of filePaths) {
+    await Promise.all(filePaths.map(async (p) => {
         const target = path.join(options.path, path.basename(p));
         const st = await dntShim.Deno.lstat(target);
         if (st.isFile) {
             await dntShim.Deno.remove(target);
         }
-    }
+    }));
 }

package/esm/clean-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AASA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBA+B9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AASA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAiC9B"}

package/esm/clean-assets/ios.js

@@ -10,6 +10,7 @@ export default async function cleanAssetsIos(filePaths, platformConfig, options)
     const project = xcode.project(platformConfig.pbxprojPath).parseSync();
     createGroupWithMessage(project, "Resources");
     for (const targetUUID of getTargetUUIDs(project)) {
+        // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         const plist = await getPlist(project, platformConfig.path, targetUUID);
         const removedFiles = filePaths.map((p) => {
             return project.removeResourceFile(path.relative(platformConfig.path, p), { target: targetUUID });
@@ -19,6 +20,7 @@ export default async function cleanAssetsIos(filePaths, platformConfig, options)
             const allFonts = existingFonts.filter((file) => removedFiles.indexOf(file) === -1);
             plist.UIAppFonts = Array.from(new Set(allFonts)); // use Set to dedupe w/existing
         }
+        // deno-lint-ignore no-await-in-loop
         await writePlist(project, platformConfig.path, plist, targetUUID);
     }
     await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());

package/esm/copy-assets/ios.d.ts

@@ -1,4 +1,4 @@
-export default function cleanAssetsIos(filePaths: string[], platformConfig: {
+export default function copyAssetsIos(filePaths: string[], platformConfig: {
     path: string;
     pbxprojPath: string;
 }, options: {

package/esm/copy-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAWA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAsC9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAWA,wBAA8B,aAAa,CACzC,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAyC9B"}

package/esm/copy-assets/ios.js

@@ -8,7 +8,7 @@ import createGroupWithMessage from "../react-native-lib/ios/createGroupWithMessa
 import getPlist from "../react-native-lib/ios/getPlist.js";
 import writePlist from "../react-native-lib/ios/writePlist.js";
 import { getTargetUUIDs } from "../utils.js";
-export default async function cleanAssetsIos(filePaths, platformConfig, options) {
+export default async function copyAssetsIos(filePaths, platformConfig, options) {
     const project = xcode.project(platformConfig.pbxprojPath);
     const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => {
         const decoder = new TextDecoder("utf-8");
@@ -16,14 +16,19 @@ export default async function cleanAssetsIos(filePaths, platformConfig, options)
     });
     project.hash = xcodeParser.parse(pbxprojContent);
     createGroupWithMessage(project, "Resources");
+    const fileBasenames = filePaths.map((p) => path.basename(p));
     for (const targetUUID of getTargetUUIDs(project)) {
+        // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         const plist = await getPlist(project, platformConfig.path, targetUUID);
-        const addedFiles = filePaths.map((p) => project.addResourceFile(path.relative(platformConfig.path, p), { target: targetUUID })).filter((x) => x).map((file) => file.basename);
-        if (options.addFont) {
+        for (const filePath of filePaths) {
+            project.addResourceFile(path.relative(platformConfig.path, filePath), { target: targetUUID });
+        }
+        if (options.addFont && plist) {
             const existingFonts = plist.UIAppFonts || [];
-            const allFonts = [...existingFonts, ...addedFiles];
+            const allFonts = [...existingFonts, ...fileBasenames];
             plist.UIAppFonts = Array.from(new Set(allFonts)); // use Set to dedupe w/existing
         }
+        // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         await writePlist(project, platformConfig.path, plist, targetUUID);
     }
     await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());

package/esm/main.js

@@ -137,9 +137,7 @@ export const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, })
             }
         };
         const loadAll = async () => {
-            for (const p of assetsPaths) {
-                await loadAsset(p);
-            }
+            await Promise.all(assetsPaths.map((p) => loadAsset(p)));
             assets = clearDuplicated(assets);
         };
         // run loading synchronously for simplicity
@@ -171,10 +169,12 @@ export const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, })
                 .filter(filterFilesToIgnore);
             if (su && prevRelativeAssetsWithExt.length > 0) {
                 console.info(`Cleaning previously linked ${fileConfigName} assets from ${name} project, prevRelativeAssetsWithExt: ${prevRelativeAssetsWithExt.map((x) => x.path)}`);
+                // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
                 await cleanAssets(prevRelativeAssetsWithExt.map(({ path: filePath }) => getAbsolute({ filePath, dirPath: rp })), platformConfig, options);
             }
             if (assetsWithExt.length > 0) {
                 console.info(`Linking ${fileConfigName} assets to ${name} project`);
+                // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
                 await copyAssets(assetsWithExt.map(({ path: assetPath }) => assetPath), platformConfig, options);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-asset",
-  "version": "2.2.12",
+  "version": "2.2.13",
   "description": "Linking and unlinking of assets in your react-native app, works for fonts and sounds",
   "keywords": [
     "react-native",

package/script/clean-assets/android.js

@@ -38,11 +38,11 @@ const dntShim = __importStar(require("../_dnt.shims.js"));
 const path = __importStar(require("../deps/jsr.io/@std/path/1.1.4/mod.js"));
 async function cleanAssetsAndroid(filePaths, _platformConfig, options) {
     console.log(`options path in cleanAssetsAndroid: ${options.path}`);
-    for (const p of filePaths) {
+    await Promise.all(filePaths.map(async (p) => {
         const target = path.join(options.path, path.basename(p));
         const st = await dntShim.Deno.lstat(target);
         if (st.isFile) {
             await dntShim.Deno.remove(target);
         }
-    }
+    }));
 }

package/script/clean-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AASA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBA+B9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AASA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAiC9B"}

package/script/clean-assets/ios.js

@@ -49,6 +49,7 @@ async function cleanAssetsIos(filePaths, platformConfig, options) {
     const project = xcode.project(platformConfig.pbxprojPath).parseSync();
     (0, createGroupWithMessage_js_1.default)(project, "Resources");
     for (const targetUUID of (0, utils_js_1.getTargetUUIDs)(project)) {
+        // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         const plist = await (0, getPlist_js_1.default)(project, platformConfig.path, targetUUID);
         const removedFiles = filePaths.map((p) => {
             return project.removeResourceFile(path.relative(platformConfig.path, p), { target: targetUUID });
@@ -58,6 +59,7 @@ async function cleanAssetsIos(filePaths, platformConfig, options) {
             const allFonts = existingFonts.filter((file) => removedFiles.indexOf(file) === -1);
             plist.UIAppFonts = Array.from(new Set(allFonts)); // use Set to dedupe w/existing
         }
+        // deno-lint-ignore no-await-in-loop
         await (0, writePlist_js_1.default)(project, platformConfig.path, plist, targetUUID);
     }
     await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());

package/script/copy-assets/ios.d.ts

@@ -1,4 +1,4 @@
-export default function cleanAssetsIos(filePaths: string[], platformConfig: {
+export default function copyAssetsIos(filePaths: string[], platformConfig: {
     path: string;
     pbxprojPath: string;
 }, options: {

package/script/copy-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAWA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAsC9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAWA,wBAA8B,aAAa,CACzC,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAyC9B"}

package/script/copy-assets/ios.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = cleanAssetsIos;
+exports.default = copyAssetsIos;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const path = __importStar(require("../deps/jsr.io/@std/path/1.1.4/mod.js"));
 /// <reference types="../xcode.d.ts" />
@@ -47,7 +47,7 @@ const createGroupWithMessage_js_1 = __importDefault(require("../react-native-lib
 const getPlist_js_1 = __importDefault(require("../react-native-lib/ios/getPlist.js"));
 const writePlist_js_1 = __importDefault(require("../react-native-lib/ios/writePlist.js"));
 const utils_js_1 = require("../utils.js");
-async function cleanAssetsIos(filePaths, platformConfig, options) {
+async function copyAssetsIos(filePaths, platformConfig, options) {
     const project = xcode.project(platformConfig.pbxprojPath);
     const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => {
         const decoder = new TextDecoder("utf-8");
@@ -55,14 +55,19 @@ async function cleanAssetsIos(filePaths, platformConfig, options) {
     });
     project.hash = xcodeParser.parse(pbxprojContent);
     (0, createGroupWithMessage_js_1.default)(project, "Resources");
+    const fileBasenames = filePaths.map((p) => path.basename(p));
     for (const targetUUID of (0, utils_js_1.getTargetUUIDs)(project)) {
+        // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         const plist = await (0, getPlist_js_1.default)(project, platformConfig.path, targetUUID);
-        const addedFiles = filePaths.map((p) => project.addResourceFile(path.relative(platformConfig.path, p), { target: targetUUID })).filter((x) => x).map((file) => file.basename);
-        if (options.addFont) {
+        for (const filePath of filePaths) {
+            project.addResourceFile(path.relative(platformConfig.path, filePath), { target: targetUUID });
+        }
+        if (options.addFont && plist) {
             const existingFonts = plist.UIAppFonts || [];
-            const allFonts = [...existingFonts, ...addedFiles];
+            const allFonts = [...existingFonts, ...fileBasenames];
             plist.UIAppFonts = Array.from(new Set(allFonts)); // use Set to dedupe w/existing
         }
+        // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         await (0, writePlist_js_1.default)(project, platformConfig.path, plist, targetUUID);
     }
     await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());

package/script/main.js

@@ -176,9 +176,7 @@ const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, }) => {
             }
         };
         const loadAll = async () => {
-            for (const p of assetsPaths) {
-                await loadAsset(p);
-            }
+            await Promise.all(assetsPaths.map((p) => loadAsset(p)));
             assets = clearDuplicated(assets);
         };
         // run loading synchronously for simplicity
@@ -210,10 +208,12 @@ const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, }) => {
                 .filter(filterFilesToIgnore);
             if (su && prevRelativeAssetsWithExt.length > 0) {
                 console.info(`Cleaning previously linked ${fileConfigName} assets from ${name} project, prevRelativeAssetsWithExt: ${prevRelativeAssetsWithExt.map((x) => x.path)}`);
+                // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
                 await cleanAssets(prevRelativeAssetsWithExt.map(({ path: filePath }) => getAbsolute({ filePath, dirPath: rp })), platformConfig, options);
             }
             if (assetsWithExt.length > 0) {
                 console.info(`Linking ${fileConfigName} assets to ${name} project`);
+                // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
                 await copyAssets(assetsWithExt.map(({ path: assetPath }) => assetPath), platformConfig, options);
             }
         }