Skip to content

Commit

Permalink
Merge pull request #31 from UmamiAppearance/cut
Browse files Browse the repository at this point in the history 
merging the addition of moving units
  • Loading branch information
@UmamiAppearance
UmamiAppearance authored Jan 13, 2023
2 parents f6b40cd + 0a7de85 commit fc15d94
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 38 deletions.
83 changes: 65 additions & 18 deletions cjs/import-manager.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var acorn = require('acorn');
var acornWalk = require('acorn-walk');
var MagicString = require('magic-string');
var colorette = require('colorette');
var os = require('os');

/**
* Custom error to tell the user, that it is
Expand Down Expand Up @@ -359,11 +360,14 @@ class ImportManagerUnitMethods {
* Debugging method to stop the building process
* and list this unit properties.
*/
log() {
log(error=true) {
const unit = { ...this.unit };
delete unit.methods;
unit.code = [ unit.code.toString() ];
throw new DebuggingError(unit);
if (error) {
throw new DebuggingError(unit);
}
return unit;
}
}

Expand All @@ -375,7 +379,7 @@ class ImportManagerUnitMethods {
* It handles code analysis, creates units from import
* statements, attaches methods to the units and more.
*
* @version 0.2.2
* @version 0.3.0
* @author UmamiAppearance [[email protected]]
* @license MIT
* @see https://github.com/UmamiAppearance/rollup-plugin-import-manager
Expand Down Expand Up @@ -597,13 +601,13 @@ class ImportManager {
}).body.at(0);
} catch(e) {
if (e instanceof SyntaxError) {
let msg = "\n\nGenerated Code Snippet\n----------------------\n";
let msg = `${os.EOL}${os.EOL}Generated Code Snippet${os.EOL}----------------------${os.EOL}`;
let { line, column } = e.loc;
line --;
code.toString().split("\n").forEach((l, i) => {
msg += l + "\n";
code.toString().split(os.EOL).forEach((l, i) => {
msg += `l${os.EOL}`;
if (line === i) {
msg += colorette.bold(" ".repeat(column) + "^\n");
msg += colorette.bold(" ".repeat(column) + `^${os.EOL}`);
}
});

Expand Down Expand Up @@ -803,10 +807,10 @@ class ImportManager {
`ID: ${unit.id}`,
`HASH: ${unit.hash}`,
`NAME: ${unit.module.name}`,
`STATEMENT:\n${unit.code.toString()}\n`
`STATEMENT:${os.EOL}${unit.code.toString()}${os.EOL}`
);
});
return msgArray.join("\n") + "\n";
return msgArray.join(os.EOL) + os.EOL;
}


Expand Down Expand Up @@ -891,13 +895,13 @@ class ImportManager {
typeStr = "any group";
}

msg += `___\nUnable to locate import statement with name: '${name}' in ${typeStr}`;
msg += `___${os.EOL}Unable to locate import statement with name: '${name}' in ${typeStr}`;
throw new MatchError(msg);
}

else if (units.length > 1) {
let msg = this.#listUnits(units);
msg += `___\nFound multiple matches for '${name}'. If no other solution is available you may select via hash.`;
msg += `___${os.EOL}Found multiple matches for '${name}'. If no other solution is available you may select via hash.`;
throw new MatchError(msg);
}

Expand Down Expand Up @@ -943,7 +947,7 @@ class ImportManager {
return null;
}
let msg = this.#listUnits(this.imports[type].units);
msg += `___\nUnable to locate import statement with id: '${id}'`;
msg += `___${os.EOL}Unable to locate import statement with id: '${id}'`;
throw new MatchError(msg);
}

Expand Down Expand Up @@ -971,7 +975,7 @@ class ImportManager {
return null;
}
let msg = this.#listAllUnits();
msg += `___\nUnable to locate import statement with hash '${hash}'`;
msg += `___${os.EOL}Unable to locate import statement with hash '${hash}'`;
throw new MatchError(msg);
}

Expand All @@ -996,13 +1000,27 @@ class ImportManager {
* Removes a unit from the code instance.
* The action must not be committed.
* @param {Object} unit - Unit Object.
* @returns {string} - Unit code, for further processing.
*/
remove(unit) {
const charAfter = this.code.slice(unit.end, unit.end+1);
const end = (charAfter === "\n") ? unit.end + 1 : unit.end;
let charAfter = this.code.slice(unit.end, unit.end+1);
let end = unit.end;

if (charAfter === "\r") {
end++;
charAfter = this.code.slice(end, end+1);
}
if (charAfter === "\n") {
end++;
}

const code = this.code.slice(unit.start, end);

this.code.remove(unit.start, end);
unit.methods.makeUntraceable();
this.imports[unit.type].count --;

return code;
}

/**
Expand All @@ -1028,7 +1046,7 @@ class ImportManager {
*/
makeCJSStatement(module, declarator, varname) {
const declaration = this.#genDeclaration(declarator, varname);
return `${declaration} = require("${module}");\n`;
return `${declaration} = require("${module}");${os.EOL}`;
}

/**
Expand All @@ -1038,7 +1056,7 @@ class ImportManager {
*/
makeDynamicStatement(module, declarator, varname) {
const declaration = this.#genDeclaration(declarator, varname);
return `${declaration} = await import("${module}");\n`;
return `${declaration} = await import("${module}");${os.EOL}`;
}


Expand Down Expand Up @@ -1069,7 +1087,7 @@ class ImportManager {
memberPart += " from ";
}

return `import ${memberPart}'${module}';\n`;
return `import ${memberPart}'${module}';${os.EOL}`;
}


Expand Down Expand Up @@ -1099,6 +1117,9 @@ class ImportManager {
nextChar = null;
}

if (nextChar === "\r") {
index ++;
}
if (nextChar === "\n") {
index ++;
}
Expand Down Expand Up @@ -1128,6 +1149,9 @@ class ImportManager {
let index;
if (mode === "append") {
index = unit.end;
if (this.code.slice(index, index+1) === "\r") {
index ++;
}
if (this.code.slice(index, index+1) === "\n") {
index ++;
}
Expand All @@ -1153,6 +1177,29 @@ class ImportManager {
// ________________________ //
// global debugging methods //


/**
* Debug statements created by IM.
* @param {string} code - Code Snippet String.
* @param {Object} [target] - Target Unit Object.
* @param {string} [type] - Target type.
* @param {string} [mode] - Insert position or attach mode.
*/
logCreations(code, target, type, mode) {
let msg = {
addCode: code
};
if (target) {
msg.mode = mode;
msg.targetType = target.type;
msg.targetUnit = target.methods.log(false);
} else if (type) {
msg.insert = mode;
msg.targetType = type;
}
throw new DebuggingError(msg);
}


/**
* Debugging method to stop the building process
Expand Down
2 changes: 1 addition & 1 deletion cjs/import-manager.cjs.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "import-manager",
"version": "0.2.2",
"version": "0.3.0",
"description": "A class to analyze and manipulate JavaScript import statements from source code files.",
"main": "./cjs/import-manager.cjs",
"module": "./src/core.js",
Expand Down
53 changes: 37 additions & 16 deletions src/core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* It handles code analysis, creates units from import
* statements, attaches methods to the units and more.
*
* @version 0.2.2
* @version 0.3.0
* @author UmamiAppearance [[email protected]]
* @license MIT
* @see https://github.com/UmamiAppearance/rollup-plugin-import-manager
Expand All @@ -18,6 +18,7 @@ import { parse } from "acorn";
import { full as fullWalk } from "acorn-walk";
import MagicString from "magic-string";
import { bold, yellow } from "colorette";
import { EOL } from "os";


class ImportManager {
Expand Down Expand Up @@ -235,13 +236,13 @@ class ImportManager {
}).body.at(0);
} catch(e) {
if (e instanceof SyntaxError) {
let msg = "\n\nGenerated Code Snippet\n----------------------\n";
let msg = `${EOL}${EOL}Generated Code Snippet${EOL}----------------------${EOL}`;
let { line, column } = e.loc;
line --;
code.toString().split("\n").forEach((l, i) => {
msg += l + "\n";
code.toString().split(EOL).forEach((l, i) => {
msg += `l${EOL}`;
if (line === i) {
msg += bold(" ".repeat(column) + "^\n");
msg += bold(" ".repeat(column) + `^${EOL}`);
}
});

Expand Down Expand Up @@ -441,10 +442,10 @@ class ImportManager {
`ID: ${unit.id}`,
`HASH: ${unit.hash}`,
`NAME: ${unit.module.name}`,
`STATEMENT:\n${unit.code.toString()}\n`
`STATEMENT:${EOL}${unit.code.toString()}${EOL}`
);
});
return msgArray.join("\n") + "\n";
return msgArray.join(EOL) + EOL;
}


Expand Down Expand Up @@ -529,13 +530,13 @@ class ImportManager {
typeStr = "any group";
}

msg += `___\nUnable to locate import statement with name: '${name}' in ${typeStr}`;
msg += `___${EOL}Unable to locate import statement with name: '${name}' in ${typeStr}`;
throw new MatchError(msg);
}

else if (units.length > 1) {
let msg = this.#listUnits(units);
msg += `___\nFound multiple matches for '${name}'. If no other solution is available you may select via hash.`;
msg += `___${EOL}Found multiple matches for '${name}'. If no other solution is available you may select via hash.`;
throw new MatchError(msg);
}

Expand Down Expand Up @@ -581,7 +582,7 @@ class ImportManager {
return null;
}
let msg = this.#listUnits(this.imports[type].units);
msg += `___\nUnable to locate import statement with id: '${id}'`;
msg += `___${EOL}Unable to locate import statement with id: '${id}'`;
throw new MatchError(msg);
}

Expand Down Expand Up @@ -609,7 +610,7 @@ class ImportManager {
return null;
}
let msg = this.#listAllUnits();
msg += `___\nUnable to locate import statement with hash '${hash}'`;
msg += `___${EOL}Unable to locate import statement with hash '${hash}'`;
throw new MatchError(msg);
}

Expand All @@ -634,13 +635,27 @@ class ImportManager {
* Removes a unit from the code instance.
* The action must not be committed.
* @param {Object} unit - Unit Object.
* @returns {string} - Unit code, for further processing.
*/
remove(unit) {
const charAfter = this.code.slice(unit.end, unit.end+1);
const end = (charAfter === "\n") ? unit.end + 1 : unit.end;
let charAfter = this.code.slice(unit.end, unit.end+1);
let end = unit.end;

if (charAfter === "\r") {
end++;
charAfter = this.code.slice(end, end+1);
}
if (charAfter === "\n") {
end++;
}

const code = this.code.slice(unit.start, end);

this.code.remove(unit.start, end);
unit.methods.makeUntraceable();
this.imports[unit.type].count --;

return code;
}

/**
Expand All @@ -666,7 +681,7 @@ class ImportManager {
*/
makeCJSStatement(module, declarator, varname) {
const declaration = this.#genDeclaration(declarator, varname);
return `${declaration} = require("${module}");\n`;
return `${declaration} = require("${module}");${EOL}`;
}

/**
Expand All @@ -676,7 +691,7 @@ class ImportManager {
*/
makeDynamicStatement(module, declarator, varname) {
const declaration = this.#genDeclaration(declarator, varname);
return `${declaration} = await import("${module}");\n`;
return `${declaration} = await import("${module}");${EOL}`;
}


Expand Down Expand Up @@ -707,7 +722,7 @@ class ImportManager {
memberPart += " from ";
}

return `import ${memberPart}'${module}';\n`;
return `import ${memberPart}'${module}';${EOL}`;
}


Expand Down Expand Up @@ -737,6 +752,9 @@ class ImportManager {
nextChar = null;
}

if (nextChar === "\r") {
index ++;
}
if (nextChar === "\n") {
index ++;
}
Expand Down Expand Up @@ -766,6 +784,9 @@ class ImportManager {
let index;
if (mode === "append") {
index = unit.end;
if (this.code.slice(index, index+1) === "\r") {
index ++;
}
if (this.code.slice(index, index+1) === "\n") {
index ++;
}
Expand Down

0 comments on commit fc15d94

Please sign in to comment.