@ryanatkn/gro 0.129.13 → 0.129.14

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.
package/dist/package.js CHANGED
@@ -1,7 +1,7 @@
1
1
  // generated by src/lib/package.gen.ts
2
2
  export const package_json = {
3
3
  name: '@ryanatkn/gro',
4
- version: '0.129.13',
4
+ version: '0.129.14',
5
5
  description: 'task runner and toolkit extending SvelteKit',
6
6
  motto: 'generate, run, optimize',
7
7
  glyph: '🌰',
@@ -266,7 +266,7 @@ export const package_json = {
266
266
  };
267
267
  export const src_json = {
268
268
  name: '@ryanatkn/gro',
269
- version: '0.129.13',
269
+ version: '0.129.14',
270
270
  modules: {
271
271
  '.': {
272
272
  path: 'index.ts',
@@ -1 +1 @@
1
- {"version":3,"file":"task.d.ts","sourceRoot":"../src/lib/","sources":["task.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task.d.ts","sourceRoot":"../src/lib/","sources":["task.ts"],"names":[],"mappings":"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"}
package/dist/task.js CHANGED
@@ -1,8 +1,8 @@
1
- import { strip_end, strip_start } from '@ryanatkn/belt/string.js';
1
+ import { ensure_end, strip_end, strip_start } from '@ryanatkn/belt/string.js';
2
2
  import { red } from '@ryanatkn/belt/styletext.js';
3
3
  import { isAbsolute, join, relative } from 'node:path';
4
4
  import { resolve_input_files, resolve_input_paths, } from './input_path.js';
5
- import { print_path } from './paths.js';
5
+ import { GRO_DIST_DIR, print_path } from './paths.js';
6
6
  import { search_fs } from './search_fs.js';
7
7
  import { load_modules } from './modules.js';
8
8
  export const TASK_FILE_SUFFIX_TS = '.task.ts';
@@ -16,13 +16,14 @@ export const to_task_name = (id, task_root_dir, input_path, root_path) => {
16
16
  for (const suffix of TASK_FILE_SUFFIXES) {
17
17
  task_name = strip_end(task_name, suffix);
18
18
  }
19
+ if (ensure_end(task_root_dir, '/') === GRO_DIST_DIR) {
20
+ // TODO ideally it would display this in some contexts like the task progress logs,
21
+ // but not all, like printing the task list, UNLESS there's a local override
22
+ // return 'gro/' + task_name;
23
+ return task_name;
24
+ }
19
25
  if (isAbsolute(input_path)) {
20
- // is a bit hacky, but does what we want
21
- const relative_to_root = relative(root_path, join(task_root_dir, task_name));
22
- if (relative_to_root.startsWith('node_modules/')) {
23
- return task_name;
24
- }
25
- return relative_to_root;
26
+ return relative(root_path, join(task_root_dir, task_name));
26
27
  }
27
28
  return task_name;
28
29
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ryanatkn/gro",
3
- "version": "0.129.13",
3
+ "version": "0.129.14",
4
4
  "description": "task runner and toolkit extending SvelteKit",
5
5
  "motto": "generate, run, optimize",
6
6
  "glyph": "🌰",
@@ -5,7 +5,7 @@ import type {Src_Json} from './src_json.js';
5
5
 
6
6
  export const package_json = {
7
7
  name: '@ryanatkn/gro',
8
- version: '0.129.13',
8
+ version: '0.129.14',
9
9
  description: 'task runner and toolkit extending SvelteKit',
10
10
  motto: 'generate, run, optimize',
11
11
  glyph: '🌰',
@@ -272,7 +272,7 @@ export const package_json = {
272
272
 
273
273
  export const src_json = {
274
274
  name: '@ryanatkn/gro',
275
- version: '0.129.13',
275
+ version: '0.129.14',
276
276
  modules: {
277
277
  '.': {
278
278
  path: 'index.ts',
package/src/lib/task.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type {Logger} from '@ryanatkn/belt/log.js';
2
- import {strip_end, strip_start} from '@ryanatkn/belt/string.js';
2
+ import {ensure_end, strip_end, strip_start} from '@ryanatkn/belt/string.js';
3
3
  import type {z} from 'zod';
4
4
  import type {Timings} from '@ryanatkn/belt/timings.js';
5
5
  import {red} from '@ryanatkn/belt/styletext.js';
@@ -17,7 +17,7 @@ import {
17
17
  type Resolved_Input_File,
18
18
  type Resolved_Input_Path,
19
19
  } from './input_path.js';
20
- import {print_path} from './paths.js';
20
+ import {GRO_DIST_DIR, print_path} from './paths.js';
21
21
  import {search_fs} from './search_fs.js';
22
22
  import {load_modules, type Load_Modules_Failure, type Module_Meta} from './modules.js';
23
23
 
@@ -61,13 +61,14 @@ export const to_task_name = (
61
61
  for (const suffix of TASK_FILE_SUFFIXES) {
62
62
  task_name = strip_end(task_name, suffix);
63
63
  }
64
+ if (ensure_end(task_root_dir, '/') === GRO_DIST_DIR) {
65
+ // TODO ideally it would display this in some contexts like the task progress logs,
66
+ // but not all, like printing the task list, UNLESS there's a local override
67
+ // return 'gro/' + task_name;
68
+ return task_name;
69
+ }
64
70
  if (isAbsolute(input_path)) {
65
- // is a bit hacky, but does what we want
66
- const relative_to_root = relative(root_path, join(task_root_dir, task_name));
67
- if (relative_to_root.startsWith('node_modules/')) {
68
- return task_name;
69
- }
70
- return relative_to_root;
71
+ return relative(root_path, join(task_root_dir, task_name));
71
72
  }
72
73
  return task_name;
73
74
  };