valise-sh 0.1.0 → 0.2.0
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/CHANGELOG.md +170 -9
- package/README.md +48 -24
- package/bin/valise +2453 -333
- package/docs/architecture.md +78 -9
- package/docs/contrib-modules.md +68 -15
- package/docs/installation.md +120 -33
- package/docs/module-abi.md +103 -39
- package/docs/release-policy.md +110 -6
- package/docs/shared-modules.md +124 -2
- package/docs/variants.md +318 -54
- package/examples/README.md +11 -0
- package/examples/e2e/README.md +7 -7
- package/examples/e2e/build-manifest.sh +45 -157
- package/examples/profile-project/README.md +181 -0
- package/examples/profile-project/shell/layers/demo/module.d/contrib_demo_greeting.meta +10 -0
- package/examples/profile-project/shell/layers/demo/modules/shared/contrib_demo_greeting.sh +4 -0
- package/examples/profile-project/shell/module.d/greeting.meta +10 -0
- package/examples/profile-project/shell/module.d/profile_main.meta +9 -0
- package/examples/profile-project/shell/modules/greeting.sh +5 -0
- package/examples/profile-project/shell/release/bundle-roots +9 -0
- package/examples/profile-project/shell/release/install-variants +3 -0
- package/examples/profile-project/shell/release/module-registry.tsv +4 -0
- package/examples/profile-project/shell/release/project.conf +3 -0
- package/examples/shared/README.md +2 -2
- package/lib/compiler.awk +341 -20
- package/lib/fish/loader.fish +94 -19
- package/lib/fish/metadata.fish +13 -14
- package/lib/loader.sh +737 -157
- package/lib/metadata.sh +27 -51
- package/package.json +2 -1
package/lib/metadata.sh
CHANGED
|
@@ -66,6 +66,22 @@ sp_metadata_validate_identifier_list() {
|
|
|
66
66
|
unset _spm_list _spm_label _spm_word _spm_list_ifs _spm_list_ifs_was_set _spm_list_seen
|
|
67
67
|
return 1
|
|
68
68
|
fi
|
|
69
|
+
if [ "$_spm_label" = export ]; then
|
|
70
|
+
# Exports become function definitions. A shell reserved word is a valid
|
|
71
|
+
# identifier but not a valid function name.
|
|
72
|
+
case "$_spm_word" in
|
|
73
|
+
case|do|done|elif|else|esac|fi|for|if|in|then|until|while|time)
|
|
74
|
+
sp_metadata_error "invalid export (reserved word): $_spm_word"
|
|
75
|
+
if [ "$_spm_list_ifs_was_set" -eq 1 ]; then
|
|
76
|
+
IFS=$_spm_list_ifs
|
|
77
|
+
else
|
|
78
|
+
unset IFS
|
|
79
|
+
fi
|
|
80
|
+
unset _spm_list _spm_label _spm_word _spm_list_ifs _spm_list_ifs_was_set _spm_list_seen
|
|
81
|
+
return 1
|
|
82
|
+
;;
|
|
83
|
+
esac
|
|
84
|
+
fi
|
|
69
85
|
done
|
|
70
86
|
if [ "$_spm_list_ifs_was_set" -eq 1 ]; then
|
|
71
87
|
IFS=$_spm_list_ifs
|
|
@@ -229,7 +245,7 @@ sp_metadata_validate_version() {
|
|
|
229
245
|
|
|
230
246
|
sp_metadata_validate_side_effect() {
|
|
231
247
|
case "$1" in
|
|
232
|
-
read-only | path-env | generated-file | update-network | install-time | local-secret | work-only) return 0 ;;
|
|
248
|
+
read-only | path-env | generated-file | update-network | install-time | local-secret | local-state | work-only) return 0 ;;
|
|
233
249
|
*)
|
|
234
250
|
sp_metadata_error "invalid side_effect: $1"
|
|
235
251
|
return 1
|
|
@@ -271,23 +287,13 @@ sp_metadata_validate_relative_path() {
|
|
|
271
287
|
|
|
272
288
|
sp_metadata_validate_load_target() {
|
|
273
289
|
_spm_target_load=$1
|
|
274
|
-
|
|
275
|
-
if [ -
|
|
276
|
-
sp_metadata_error 'metadata
|
|
277
|
-
unset _spm_target_load
|
|
278
|
-
return 1
|
|
279
|
-
fi
|
|
280
|
-
if [ -z "$_spm_target_load" ] && [ -z "$_spm_target_load_hook" ]; then
|
|
281
|
-
sp_metadata_error 'missing required metadata field: load or load_hook'
|
|
282
|
-
unset _spm_target_load _spm_target_load_hook
|
|
290
|
+
_spm_target_requires=${2-}
|
|
291
|
+
if [ -z "$_spm_target_load" ] && [ -z "$_spm_target_requires" ]; then
|
|
292
|
+
sp_metadata_error 'missing required metadata field: load or requires'
|
|
293
|
+
unset _spm_target_load _spm_target_requires
|
|
283
294
|
return 1
|
|
284
295
|
fi
|
|
285
|
-
|
|
286
|
-
sp_metadata_error "invalid load_hook: $_spm_target_load_hook"
|
|
287
|
-
unset _spm_target_load _spm_target_load_hook
|
|
288
|
-
return 1
|
|
289
|
-
fi
|
|
290
|
-
unset _spm_target_load _spm_target_load_hook
|
|
296
|
+
unset _spm_target_load _spm_target_requires
|
|
291
297
|
return 0
|
|
292
298
|
}
|
|
293
299
|
|
|
@@ -324,7 +330,6 @@ sp_metadata_read() (
|
|
|
324
330
|
_spm_updates=
|
|
325
331
|
_spm_version=
|
|
326
332
|
_spm_load=
|
|
327
|
-
_spm_load_hook=
|
|
328
333
|
|
|
329
334
|
while IFS= read -r _spm_line || [ -n "$_spm_line" ]; do
|
|
330
335
|
case "$_spm_line" in
|
|
@@ -349,7 +354,10 @@ sp_metadata_read() (
|
|
|
349
354
|
updates) _spm_updates=$_spm_value ;;
|
|
350
355
|
version) _spm_version=$_spm_value ;;
|
|
351
356
|
load) _spm_load=$_spm_value ;;
|
|
352
|
-
load_hook)
|
|
357
|
+
load_hook)
|
|
358
|
+
sp_metadata_error 'metadata field load_hook is not supported; use load'
|
|
359
|
+
return 1
|
|
360
|
+
;;
|
|
353
361
|
*)
|
|
354
362
|
sp_metadata_error "unknown metadata field: $_spm_key"
|
|
355
363
|
return 1
|
|
@@ -361,7 +369,6 @@ sp_metadata_read() (
|
|
|
361
369
|
sp_metadata_require_field shells "$_spm_shells" || return 1
|
|
362
370
|
sp_metadata_require_field platforms "$_spm_platforms" || return 1
|
|
363
371
|
sp_metadata_require_field side_effect "$_spm_side_effect" || return 1
|
|
364
|
-
sp_metadata_validate_load_target "$_spm_load" "$_spm_load_hook" || return 1
|
|
365
372
|
|
|
366
373
|
if ! sp_metadata_validate_identifier "$_spm_name"; then
|
|
367
374
|
sp_metadata_error "invalid module name: $_spm_name"
|
|
@@ -369,6 +376,7 @@ sp_metadata_read() (
|
|
|
369
376
|
fi
|
|
370
377
|
sp_metadata_validate_identifier_list "$_spm_requires" dependency || return 1
|
|
371
378
|
sp_metadata_validate_identifier_list "$_spm_optional" optional_dependency || return 1
|
|
379
|
+
sp_metadata_validate_load_target "$_spm_load" "$_spm_requires" || return 1
|
|
372
380
|
sp_metadata_validate_shell_list "$_spm_shells" || return 1
|
|
373
381
|
sp_metadata_validate_platform_list "$_spm_platforms" || return 1
|
|
374
382
|
sp_metadata_validate_side_effect "$_spm_side_effect" || return 1
|
|
@@ -387,36 +395,4 @@ sp_metadata_read() (
|
|
|
387
395
|
printf 'updates=%s\n' "$_spm_updates"
|
|
388
396
|
printf 'version=%s\n' "$_spm_version"
|
|
389
397
|
printf 'load=%s\n' "$_spm_load"
|
|
390
|
-
printf 'load_hook=%s\n' "$_spm_load_hook"
|
|
391
|
-
)
|
|
392
|
-
|
|
393
|
-
sp_metadata_legacy_bridge() (
|
|
394
|
-
[ "$#" -eq 4 ] || {
|
|
395
|
-
sp_metadata_error 'usage: sp_metadata_legacy_bridge <name> <requires> <side-effect> <exports>'
|
|
396
|
-
return 1
|
|
397
|
-
}
|
|
398
|
-
_spm_name=$1
|
|
399
|
-
_spm_requires=$2
|
|
400
|
-
_spm_side_effect=$3
|
|
401
|
-
_spm_exports=$4
|
|
402
|
-
|
|
403
|
-
if ! sp_metadata_validate_identifier "$_spm_name"; then
|
|
404
|
-
sp_metadata_error "invalid module name: $_spm_name"
|
|
405
|
-
return 1
|
|
406
|
-
fi
|
|
407
|
-
sp_metadata_validate_identifier_list "$_spm_requires" dependency || return 1
|
|
408
|
-
sp_metadata_validate_side_effect "$_spm_side_effect" || return 1
|
|
409
|
-
sp_metadata_validate_identifier_list "$_spm_exports" export || return 1
|
|
410
|
-
|
|
411
|
-
printf 'name=%s\n' "$_spm_name"
|
|
412
|
-
printf 'requires=%s\n' "$_spm_requires"
|
|
413
|
-
printf 'optional=\n'
|
|
414
|
-
printf 'shells=bash zsh ksh\n'
|
|
415
|
-
printf 'platforms=any\n'
|
|
416
|
-
printf 'side_effect=%s\n' "$_spm_side_effect"
|
|
417
|
-
printf 'exports=%s\n' "$_spm_exports"
|
|
418
|
-
printf 'updates=\n'
|
|
419
|
-
printf 'version=\n'
|
|
420
|
-
printf 'load=\n'
|
|
421
|
-
printf 'load_hook=_shell_module_%s\n' "$_spm_name"
|
|
422
398
|
)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "valise-sh",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Pure POSIX shell profile engine and CLI",
|
|
5
5
|
"bin": {
|
|
6
6
|
"valise": "./bin/valise"
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
"manifests/",
|
|
15
15
|
"docs/",
|
|
16
16
|
"examples/",
|
|
17
|
+
"!examples/**/build/",
|
|
17
18
|
"LICENSE",
|
|
18
19
|
"CHANGELOG.md"
|
|
19
20
|
],
|